[Orxonox-commit 6462] r11113 - in code/trunk: cmake src src/external/ois

[landauf at orxonox.net]

Author: landauf
Date: 2016-02-14 15:42:37 +0100 (Sun, 14 Feb 2016)
New Revision: 11113

Modified:
   code/trunk/cmake/LibraryConfig.cmake
   code/trunk/cmake/PackageConfigMinGW.cmake
   code/trunk/src/SourceConfig.cmake
   code/trunk/src/external/ois/CMakeLists.txt
Log:
updated build-script to work with mingw-w64 and the new dependency package

Modified: code/trunk/cmake/LibraryConfig.cmake
===================================================================
--- code/trunk/cmake/LibraryConfig.cmake	2016-02-14 12:04:05 UTC (rev 11112)
+++ code/trunk/cmake/LibraryConfig.cmake	2016-02-14 14:42:37 UTC (rev 11113)
@@ -126,11 +126,11 @@
 FIND_PACKAGE(ZLIB            REQUIRED)
 
 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()
 

Modified: code/trunk/cmake/PackageConfigMinGW.cmake
===================================================================
--- code/trunk/cmake/PackageConfigMinGW.cmake	2016-02-14 12:04:05 UTC (rev 11112)
+++ code/trunk/cmake/PackageConfigMinGW.cmake	2016-02-14 14:42:37 UTC (rev 11113)
@@ -28,7 +28,7 @@
 IF(MINGW)
 
   INCLUDE(CheckPackageVersion)
-  CHECK_PACKAGE_VERSION(6.0 7.0)
+  CHECK_PACKAGE_VERSION(7.1)
 
   # 64 bit system?
   IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
@@ -52,8 +52,12 @@
   SET(TCL_LIBRARY  ${DEP_BINARY_DIR}/tcl85.dll CACHE FILEPATH "")
   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)

Modified: code/trunk/src/SourceConfig.cmake
===================================================================
--- code/trunk/src/SourceConfig.cmake	2016-02-14 12:04:05 UTC (rev 11112)
+++ code/trunk/src/SourceConfig.cmake	2016-02-14 14:42:37 UTC (rev 11113)
@@ -44,17 +44,10 @@
 
   # 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)
 
 # Visual Leak Dectector configuration

Modified: code/trunk/src/external/ois/CMakeLists.txt
===================================================================
--- code/trunk/src/external/ois/CMakeLists.txt	2016-02-14 12:04:05 UTC (rev 11112)
+++ code/trunk/src/external/ois/CMakeLists.txt	2016-02-14 14:42:37 UTC (rev 11113)
@@ -51,11 +51,6 @@
   ADD_SUBDIRECTORY(linux)
 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)
   SET(USE_BUILD_UNITS NO_BUILD_UNITS)