Changeset 11113 for code/trunk

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

Files:

• cmake/LibraryConfig.cmake (modified) (1 diff)
• cmake/PackageConfigMinGW.cmake (modified) (2 diffs)
• src/SourceConfig.cmake (modified) (1 diff)
• src/external/ois/CMakeLists.txt (modified) (1 diff)

code/trunk/cmake/LibraryConfig.cmake

@@ -127 +127 @@
 
 IF(WIN32)
-  FIND_PACKAGE(DbgHelp)
-  FIND_PACKAGE(DirectX       REQUIRED)
   IF(MSVC)
     # Check whether we can use Visual Leak Detector
     FIND_PACKAGE(VLD QUIET)
+    FIND_PACKAGE(DbgHelp)
+    FIND_PACKAGE(DirectX       REQUIRED)
   ENDIF()
 ENDIF()

code/trunk/cmake/PackageConfigMinGW.cmake

@@ -29 +29 @@
 
   INCLUDE(CheckPackageVersion)
-  CHECK_PACKAGE_VERSION(6.0 7.0)
+  CHECK_PACKAGE_VERSION(7.1)
 
   # 64 bit system?
@@ -53 +53 @@
   SET(ZLIB_LIBRARY ${DEP_BINARY_DIR}/libzlib.dll CACHE FILEPATH "")
 
-  # Not included in MinGW, so we need to supply it for OIS
-  SET(WMI_INCLUDE_DIR ${DEP_INCLUDE_DIR}/wmi/include)
-  SET(WMI_LIBRARY     ${DEP_LIBRARY_DIR}/wbemuuid.lib)
+  # Define libraries that are part of mingw64:
+  #  - DirectX (Needed for OIS):
+  SET(DIRECTX_LIBRARIES dinput8 dxguid)
+  SET(WMI_LIBRARY wbemuuid)
+  #  - DbgHelp (Needed for SignalHandler in util library):
+  SET(DBGHELP_FOUND true)
+  SET(DBGHELP_LIBRARY dbghelp)
 
 ENDIF(MINGW)

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)