[Orxonox-commit 5545] r10208 - in code/trunk: cmake cmake/tools src/libraries/core

[muemart at orxonox.net]

Author: muemart
Date: 2015-01-29 10:29:56 +0100 (Thu, 29 Jan 2015)
New Revision: 10208

Modified:
   code/trunk/cmake/PackageConfigMSVC.cmake
   code/trunk/cmake/tools/FindCEGUI.cmake
   code/trunk/src/libraries/core/CoreIncludes.h
Log:
Some small fixes for the MSVC build
- Don't hardcode library names. It's more trouble than it's worth.
- Add debug library names for CEBUI 0.8.x
- Prevent double definitions of winsock stuff

Modified: code/trunk/cmake/PackageConfigMSVC.cmake
===================================================================
--- code/trunk/cmake/PackageConfigMSVC.cmake	2015-01-27 22:35:50 UTC (rev 10207)
+++ code/trunk/cmake/PackageConfigMSVC.cmake	2015-01-29 09:29:56 UTC (rev 10208)
@@ -53,24 +53,7 @@
 
   # Sets the library path for the FIND_LIBRARY
   SET(CMAKE_LIBRARY_PATH ${DEP_LIBRARY_DIR})
-
-  # Certain find scripts don't behave as ecpected to we have
-  # to specify the libraries ourselves.
-  IF(MSVC10)
-    SET(TCL_LIBRARY
-      optimized ${DEP_LIBRARY_DIR}/tcl85t.lib
-      debug     ${DEP_LIBRARY_DIR}/tcl85tg.lib
-      CACHE FILEPATH ""
-    )
-    SET(ZLIB_LIBRARY
-      optimized ${DEP_LIBRARY_DIR}/zlib-vc100.lib
-      debug     ${DEP_LIBRARY_DIR}/zlib-vc100_d.lib
-      CACHE FILEPATH ""
-    )
-  ELSE()
-    SET(TCL_LIBRARY  ${DEP_LIBRARY_DIR}/tcl85.lib CACHE FILEPATH "")
-    SET(ZLIB_LIBRARY ${DEP_LIBRARY_DIR}/zdll.lib  CACHE FILEPATH "")
-  ENDIF()
+  
   # Part of Platform SDK and usually gets linked automatically
   SET(WMI_LIBRARY  wbemuuid.lib)
 

Modified: code/trunk/cmake/tools/FindCEGUI.cmake
===================================================================
--- code/trunk/cmake/tools/FindCEGUI.cmake	2015-01-27 22:35:50 UTC (rev 10207)
+++ code/trunk/cmake/tools/FindCEGUI.cmake	2015-01-29 09:29:56 UTC (rev 10208)
@@ -63,7 +63,7 @@
 FIND_LIBRARY(CEGUI_LIBRARY_DEBUG
   NAMES
     CEGUIBased CEGUIBase_d CEGUIBaseD CEGUIBase_D
-    CEGUId CEGUI_d CEGUID CEGUI_D
+    CEGUId CEGUI_d CEGUID CEGUI_D CEGUIBase-0_d
   PATHS $ENV{CEGUIDIR}
   PATH_SUFFIXES lib bin
 )
@@ -85,6 +85,7 @@
 )
 FIND_LIBRARY(CEGUILUA_LIBRARY_DEBUG
   NAMES CEGUILuad CEGUILua_d CEGUILuaScriptModuled CEGUILuaScriptModule_d
+  CEGUILuaScriptModule-0_d
   PATHS $ENV{CEGUIDIR} $ENV{CEGUILUADIR}
   PATH_SUFFIXES lib bin
 )
@@ -132,7 +133,7 @@
     PATH_SUFFIXES lib bin
   )
   FIND_LIBRARY(CEGUI_OGRE_RENDERER_LIBRARY_DEBUG
-    NAMES CEGUIOgreRendererd CEGUIOgreRenderer_d
+    NAMES CEGUIOgreRendererd CEGUIOgreRenderer_d CEGUIOgreRenderer-0_d
     PATHS $ENV{CEGUIDIR} $ENV{CEGUIOGRERENDERERDIR}
     PATH_SUFFIXES lib bin
   )

Modified: code/trunk/src/libraries/core/CoreIncludes.h
===================================================================
--- code/trunk/src/libraries/core/CoreIncludes.h	2015-01-27 22:35:50 UTC (rev 10207)
+++ code/trunk/src/libraries/core/CoreIncludes.h	2015-01-29 09:29:56 UTC (rev 10208)
@@ -86,6 +86,7 @@
 
 // resolve macro conflict on windows
 #if defined(ORXONOX_PLATFORM_WINDOWS)
+#   define WIN32_LEAN_AND_MEAN
 #   include <windows.h>
 #   undef RegisterClass
 #endif