Changeset 11113 for code/trunk/src

Timestamp:

Feb 14, 2016, 3:42:37 PM (8 years ago)

Author:

landauf

Message:

updated build-script to work with mingw-w64 and the new dependency package

Location:

code/trunk/src

Files:

• SourceConfig.cmake (modified) (1 diff)
• external/ois/CMakeLists.txt (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...
-  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()
+  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(WIN32)
 

code/trunk/src/external/ois/CMakeLists.txt

@@ -52 +52 @@
 ENDIF()
 
-# MinGW doesn't come with some required Windows headers
-IF(MINGW)
-  INCLUDE_DIRECTORIES(${WMI_INCLUDE_DIR})
-ENDIF()
-
 # Apple has problems with OIS and build units
 IF(APPLE)