Enabled warnings as errors in config.inc to match travis settings

Tightened the replacement for MSVC to allow testing it in config.inc
This commit is contained in:
Nathan Phillips 2017-05-09 15:27:58 +01:00
parent 7e6338040e
commit 10eb073fba
2 changed files with 7 additions and 6 deletions

View File

@ -54,7 +54,7 @@ build_script:
cp -r deps/minisat2-2.2.1 minisat-2.2.1
patch -d minisat-2.2.1 -p1 < scripts/minisat-2.2.1-patch
call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x64
sed -i "s/BUILD_ENV.*/BUILD_ENV = MSVC/" src/config.inc
sed -i "s/BUILD_ENV[ ]*=.*/BUILD_ENV = MSVC/" src/config.inc
make -C src -j2
test_script:

View File

@ -1,11 +1,12 @@
# Build platform (use one of AUTO, Unix, OSX_Universal, MSVC, Cygwin, MinGW)
BUILD_ENV = AUTO
# Enable all warnings
#CXXFLAGS += -Wall -Wno-long-long -Wno-sign-compare -Wno-parentheses -Wno-strict-aliasing -pedantic
# Treat warnings as errors
#CXXFLAGS += -Werror
# Enable all warnings and treat them as errors
ifeq ($(BUILD_ENV),MSVC)
#CXXFLAGS += /Wall /WX
else
CXXFLAGS += -Wall -pedantic -Werror
endif
# Select optimisation or debug info
#CXXFLAGS += -O2 -DNDEBUG