Changeset 10208 for code/trunk/cmake/tools

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

File:

• code/trunk/cmake/tools/FindCEGUI.cmake (modified) (3 diffs)

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