Changeset 10208

Timestamp:

Jan 29, 2015, 10:29:56 AM (10 years ago)

Author:

muemart

Message:

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

Location:

code/trunk

Files:

• cmake/PackageConfigMSVC.cmake (modified) (1 diff)
• cmake/tools/FindCEGUI.cmake (modified) (3 diffs)
• src/libraries/core/CoreIncludes.h (modified) (1 diff)

code/trunk/cmake/PackageConfigMSVC.cmake

@@ -54 +54 @@
   # 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)

code/trunk/cmake/tools/FindCEGUI.cmake

@@ -64 +64 @@
   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
@@ -86 +86 @@
 FIND_LIBRARY(CEGUILUA_LIBRARY_DEBUG
   NAMES CEGUILuad CEGUILua_d CEGUILuaScriptModuled CEGUILuaScriptModule_d
+  CEGUILuaScriptModule-0_d
   PATHS $ENV{CEGUIDIR} $ENV{CEGUILUADIR}
   PATH_SUFFIXES lib bin
@@ -133 +134 @@
   )
   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

code/trunk/src/libraries/core/CoreIncludes.h

@@ -87 +87 @@
 // resolve macro conflict on windows
 #if defined(ORXONOX_PLATFORM_WINDOWS)
+#   define WIN32_LEAN_AND_MEAN
 #   include <windows.h>
 #   undef RegisterClass