diff options
| author | rubidium <rubidium@openttd.org> | 2009-01-25 22:51:59 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-01-25 22:51:59 +0000 |
| commit | 450b9b79009014c108afb633a207b444ccb3600b (patch) | |
| tree | 8b41877895ee11ade1af2ca4bf09d5060aad47b0 | |
| parent | 562299d8094d760858c817fb0a122bbb2beda50d (diff) | |
| download | openttd-450b9b79009014c108afb633a207b444ccb3600b.tar.xz | |
(svn r15275) -Fix: SDL adds _GNU_SOURCE to the defined macros even when the compiler doesn't provide the functions promised when that define exists...
| -rw-r--r-- | config.lib | 3 | ||||
| -rw-r--r-- | src/stdafx.h | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/config.lib b/config.lib index 565fd46b8..943f5a6f1 100644 --- a/config.lib +++ b/config.lib @@ -1205,7 +1205,8 @@ make_cflags_and_ldflags() { if [ -n "$sdl_config" ]; then CFLAGS="$CFLAGS -DWITH_SDL" - CFLAGS="$CFLAGS `$sdl_config --cflags`" + # SDL must not add _GNU_SOURCE as it breaks many platforms + CFLAGS="$CFLAGS `$sdl_config --cflags | sed 's~-D_GNU_SOURCE[^ ]*~~'`" if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ] && [ "$os" != "WINCE" ]; then if [ "$enable_static" != "0" ]; then LIBS="$LIBS `$sdl_config --static-libs`" diff --git a/src/stdafx.h b/src/stdafx.h index 99595ffd7..97785e0be 100644 --- a/src/stdafx.h +++ b/src/stdafx.h @@ -145,11 +145,6 @@ #include <malloc.h> // alloca() #endif -#if defined(__MINGW32__) && defined(_GNU_SOURCE) - /* For some weird reasons, SDL defines _GNU_SOURCE */ - #undef _GNU_SOURCE -#endif - #if defined(WIN32) #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #endif |