diff options
| author | John Fultz <jfultz@wolfram.com> | 2015-11-06 20:39:57 -0600 |
|---|---|---|
| committer | John Fultz <jfultz@wolfram.com> | 2015-11-06 20:39:57 -0600 |
| commit | fd68f76c1311aa40612d8502b83df84c931812be (patch) | |
| tree | e9c21a12904088dda336bfa00506f912e9dd3534 | |
| parent | db11bc3cd7bfac2126623a6af2c30778f26f361c (diff) | |
Some Windows build updates.
| -rw-r--r-- | README.Windows | 6 | ||||
| -rwxr-xr-x | gaddagize/gaddagize.pro | 2 | ||||
| -rwxr-xr-x | makegaddag/makegaddag.pro | 2 | ||||
| -rw-r--r-- | makeminidawg/makeminidawg.pro | 2 | ||||
| -rw-r--r-- | quacker/quacker.pro | 2 | ||||
| -rw-r--r-- | quackleio/quackleio.pro | 4 | ||||
| -rw-r--r-- | test/test.pro | 2 |
7 files changed, 12 insertions, 8 deletions
diff --git a/README.Windows b/README.Windows index 745ea77..5ac6fc3 100644 --- a/README.Windows +++ b/README.Windows @@ -60,6 +60,12 @@ working executable... * You can now run quackle\quacker\release\Quackle.exe +* If, when running Visual Studio builds, you get a "fatal error CVT1100", + then it can be fixed as follows: + + In the Solution Explorer, open up Quackle, then Generated Files + + Look for any copies of quacker.res + + Right-click on each one and choose Exclude From Project + Additional things to know: -------------------------- diff --git a/gaddagize/gaddagize.pro b/gaddagize/gaddagize.pro index 5998fbf..505c237 100755 --- a/gaddagize/gaddagize.pro +++ b/gaddagize/gaddagize.pro @@ -17,7 +17,7 @@ release { OBJECTS_DIR = obj/release } -QMAKE_CXXFLAGS += -std=c++11 -Wno-unknown-warning-option -Wno-deprecated-register +QMAKE_CXXFLAGS:!win32-msvc2013 += -std=c++11 -Wno-unknown-warning-option -Wno-deprecated-register # Input SOURCES += gaddagize.cpp diff --git a/makegaddag/makegaddag.pro b/makegaddag/makegaddag.pro index fa0573d..8ec4699 100755 --- a/makegaddag/makegaddag.pro +++ b/makegaddag/makegaddag.pro @@ -27,7 +27,7 @@ win32:!win32-g++ { LIBS += -lquackleio -lquackle } -QMAKE_CXXFLAGS += -std=c++11 -Wno-unknown-warning-option -Wno-deprecated-register +QMAKE_CXXFLAGS:!win32-msvc2013 += -std=c++11 -Wno-unknown-warning-option -Wno-deprecated-register # Input SOURCES += makegaddag.cpp diff --git a/makeminidawg/makeminidawg.pro b/makeminidawg/makeminidawg.pro index f629a37..540758c 100644 --- a/makeminidawg/makeminidawg.pro +++ b/makeminidawg/makeminidawg.pro @@ -26,7 +26,7 @@ win32:!win32-g++ { LIBS += -lquackleio -lquackle } -QMAKE_CXXFLAGS += -std=c++11 -Wno-unknown-warning-option -Wno-deprecated-register +QMAKE_CXXFLAGS:!win32-msvc2013 += -std=c++11 -Wno-unknown-warning-option -Wno-deprecated-register # Input diff --git a/quacker/quacker.pro b/quacker/quacker.pro index 599fd10..57957d5 100644 --- a/quacker/quacker.pro +++ b/quacker/quacker.pro @@ -31,7 +31,7 @@ win32:!win32-g++ { } macx:LIBS += -framework CoreFoundation -QMAKE_CXXFLAGS += -std=c++11 -Wno-unknown-warning-option -Wno-deprecated-register +QMAKE_CXXFLAGS:!win32-msvc2013 += -std=c++11 -Wno-unknown-warning-option -Wno-deprecated-register # Input HEADERS += *.h diff --git a/quackleio/quackleio.pro b/quackleio/quackleio.pro index dba23b8..b3a9745 100644 --- a/quackleio/quackleio.pro +++ b/quackleio/quackleio.pro @@ -15,14 +15,12 @@ release { MOC_DIR = moc -QMAKE_CXXFLAGS += -std=c++11 - # enable/disable debug symbols #CONFIG += debug staticlib CONFIG += release staticlib CONFIG -= x11 -QMAKE_CXXFLAGS += -std=c++11 -Wno-unknown-warning-option -Wno-deprecated-register +QMAKE_CXXFLAGS:!win32-msvc2013 += -std=c++11 -Wno-unknown-warning-option -Wno-deprecated-register # Input HEADERS += *.h diff --git a/test/test.pro b/test/test.pro index bb04d0c..4fbf69a 100644 --- a/test/test.pro +++ b/test/test.pro @@ -26,7 +26,7 @@ win32:!win32-g++ { LIBS += -lquackleio -lquackle } -QMAKE_CXXFLAGS += -std=c++11 -Wno-unknown-warning-option -Wno-deprecated-register +QMAKE_CXXFLAGS:!win32-msvc2013 += -std=c++11 -Wno-unknown-warning-option -Wno-deprecated-register # Input HEADERS += testharness.h trademarkedboards.h |