diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-13 13:07:20 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-13 13:07:20 +0400 |
| commit | 92089e3c4d89c2689dbd4452fb21cbbd9a0ecc71 (patch) | |
| tree | b22c37b97efec05c592b86f03a098f56179a7f5b /build_files | |
| parent | 9c4165fde0ba8c8d05b49240dab8abdf2d187861 (diff) | |
| parent | 520778163debe82b8cebe9ddec6ab4111ab2d6bd (diff) | |
svn merge -r39900:40000 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/macros.cmake | 1 | ||||
| -rw-r--r-- | build_files/scons/config/win32-mingw-config.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 58938c8b0b0..d09215d040d 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -392,6 +392,7 @@ macro(remove_strict_flags) remove_flag("-Wstrict-prototypes") remove_flag("-Wunused-parameter") remove_flag("-Wwrite-strings") + remove_flag("-Wundef") remove_flag("-Wshadow") remove_flag("-Werror=[^ ]+") remove_flag("-Werror") diff --git a/build_files/scons/config/win32-mingw-config.py b/build_files/scons/config/win32-mingw-config.py index c815b76ef73..37d693db560 100644 --- a/build_files/scons/config/win32-mingw-config.py +++ b/build_files/scons/config/win32-mingw-config.py @@ -174,7 +174,7 @@ C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement', '-Wstrict-pro CC_WARN = [ '-Wall' ] -LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++','-lole32','-luuid'] +LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++','-lole32','-luuid', '-lwsock32'] PLATFORM_LINKFLAGS = ['--stack,2097152'] |