Changeset 9683 for code/trunk

Timestamp:

Oct 2, 2013, 11:38:00 PM (11 years ago)

Author:

landauf

Message:

mingw with gcc 4.8 has its own version of sdkddkver.h which apparently requires different defines. it looks like those different defines work for all versions of mingw. we use now normal defines for msvc and different defines for mingw.
removed define from win32.c since it's already defined by a compiler flag

Location:

code/trunk/src

Files:

• SourceConfig.cmake (modified) (1 diff)
• external/enet/win32.c (modified) (1 diff)

code/trunk/src/SourceConfig.cmake

@@ -45 +45 @@
   # Target Windows XP as minimum Windows version
   # And try to catch all the different macro defines for that...
-  ADD_COMPILER_FLAGS("-D_WIN32_WINNT=0x0501")
-  ADD_COMPILER_FLAGS("-D_WIN32_WINDOWS=0x0501")
-  ADD_COMPILER_FLAGS("-DWINVER=0x0501")
-  ADD_COMPILER_FLAGS("-DNTDDI_VERSION=0x05010000")
+  IF(MINGW)
+    ADD_COMPILER_FLAGS("-D_WIN32_WINNT=0x05010000")
+    ADD_COMPILER_FLAGS("-D_WIN32_WINDOWS=0x05010000")
+    ADD_COMPILER_FLAGS("-DWINVER=0x05010000")
+    ADD_COMPILER_FLAGS("-DNTDDI_VERSION=0x05010000")
+  ELSE()
+    ADD_COMPILER_FLAGS("-D_WIN32_WINNT=0x0501")
+    ADD_COMPILER_FLAGS("-D_WIN32_WINDOWS=0x0501")
+    ADD_COMPILER_FLAGS("-DWINVER=0x0501")
+    ADD_COMPILER_FLAGS("-DNTDDI_VERSION=0x05010000")
+  ENDIF()
 ENDIF(WIN32)
 

code/trunk/src/external/enet/win32.c

@@ -4 +4 @@
 */
 #ifdef WIN32
-
-#define _WIN32_WINNT 0x0501
 
 #include <time.h>