From aabd702dbdbba5af116f37c401f6a17f0ac714ca Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Tue, 6 Sep 2011 11:17:29 +0000 Subject: fix link issues with MinGW - a substitute declaration(correctByteOrder) for itoln that was not present in MinGW was being used. Duplicated the declaration from (tried including but gave some errors) and added the appropriate link library, wsock32, according to MinGW documentation. --- build_files/scons/config/win32-mingw-config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build_files') 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'] -- cgit v1.2.3 From 47ffe63c86eb495aa5556939467692484aea8322 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 6 Sep 2011 13:00:46 +0000 Subject: remove -Wundef for code we don't maintain & generated code. --- build_files/cmake/macros.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'build_files') 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") -- cgit v1.2.3