From c62c44bdc18680843fde9dfb6d44cc33b899d7f2 Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Fri, 6 Feb 2015 23:50:51 +1300 Subject: [PATCH] Fix for scons + mingw64 warning flags fix So, it turns out my changes here the other day were a bit too over-eager: -Wdeclaration-after-statement and -Wstrict-prototypes only applied to C code and not C++ (which that set of flags was getting included for too). However, -Wno-char-subscripts is fine where it is now, so I've left it in place --- build_files/scons/config/win64-mingw-config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build_files/scons/config/win64-mingw-config.py b/build_files/scons/config/win64-mingw-config.py index 16574f7b4eb..ab39568df55 100644 --- a/build_files/scons/config/win64-mingw-config.py +++ b/build_files/scons/config/win64-mingw-config.py @@ -188,10 +188,10 @@ REL_CFLAGS = [] REL_CXXFLAGS = [] REL_CCFLAGS = ['-O2', '-ftree-vectorize'] -# NOTE: C_WARN gets ignored -#C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement', '-Wstrict-prototypes'] +# NOTE: C_WARN seems to get ignored - at least -Wno-char-subscripts doesn't work! +C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement', '-Wstrict-prototypes'] -CC_WARN = [ '-Wall', '-Wno-char-subscripts', '-Wdeclaration-after-statement', '-Wstrict-prototypes' ] +CC_WARN = [ '-Wall', '-Wno-char-subscripts' ] LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++','-lole32','-luuid', '-lwsock32', '-lpsapi', '-lpthread']