Changeset 8221

Timestamp:

Apr 10, 2011, 3:28:27 AM (13 years ago)

Author:

rgrieder

Message:

Changes that allow the Visual Studio 2010 dependencies to be used.

Location:

code/branches/kicklib

Files:

• cmake/LibraryConfig.cmake (modified) (1 diff)
• cmake/PackageConfigMSVC.cmake (modified) (1 diff)
• cmake/tools/FindOgg.cmake (modified) (1 diff)
• cmake/tools/FindVorbis.cmake (modified) (1 diff)
• src/CMakeLists.txt (modified) (1 diff)

code/branches/kicklib/cmake/LibraryConfig.cmake

@@ -58 +58 @@
   ELSEIF(MSVC90)
     SET(_compiler_prefix msvc9)
-  ELSEIF(MSVC100)
+  ELSEIF(MSVC10)
     SET(_compiler_prefix msvc10)
   ENDIF()

code/branches/kicklib/cmake/PackageConfigMSVC.cmake

@@ -57 +57 @@
   # Certain find scripts don't behave as ecpected to we have
   # to specify the libraries ourselves.
-  SET(TCL_LIBRARY  ${DEP_LIBRARY_DIR}/tcl85.lib CACHE FILEPATH "")
-  SET(ZLIB_LIBRARY ${DEP_LIBRARY_DIR}/zdll.lib  CACHE FILEPATH "")
+  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}/zlibwapi.lib
+      debug     ${DEP_LIBRARY_DIR}/zlibwapi_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/branches/kicklib/cmake/tools/FindOgg.cmake

@@ -22 +22 @@
 )
 FIND_LIBRARY(OGG_LIBRARY_OPTIMIZED
-  NAMES ogg ogg-0
+  NAMES ogg ogg-0 libogg
   PATHS $ENV{OGGDIR}
   PATH_SUFFIXES lib
 )
 FIND_LIBRARY(OGG_LIBRARY_DEBUG
-  NAMES oggd ogg_d oggD ogg_D
+  NAMES oggd ogg_d oggD ogg_D libogg_d
   PATHS $ENV{OGGDIR}
   PATH_SUFFIXES lib

code/branches/kicklib/cmake/tools/FindVorbis.cmake

@@ -22 +22 @@
 )
 FIND_LIBRARY(VORBIS_LIBRARY_OPTIMIZED
-  NAMES vorbis vorbis-0
+  NAMES vorbis vorbis-0 libvorbis
   PATHS $ENV{VORBISDIR}
   PATH_SUFFIXES lib
 )
 FIND_LIBRARY(VORBIS_LIBRARY_DEBUG
-  NAMES vorbisd vorbis_d vorbisD vorbis_D
+  NAMES vorbisd vorbis_d vorbisD vorbis_D libvorbis_d
   PATHS $ENV{VORBISDIR}
   PATH_SUFFIXES lib
 )
 FIND_LIBRARY(VORBISFILE_LIBRARY_OPTIMIZED
-  NAMES vorbisfile vorbisfile-3
+  NAMES vorbisfile vorbisfile-3 libvorbisfile
   PATHS $ENV{VORBISDIR}
   PATH_SUFFIXES lib
 )
 FIND_LIBRARY(VORBISFILE_LIBRARY_DEBUG
-  NAMES vorbisfiled vorbisfile_d vorbisfileD vorbisfile_D
+  NAMES vorbisfiled vorbisfile_d vorbisfileD vorbisfile_D libvorbisfile_d
   PATHS $ENV{VORBISDIR}
   PATH_SUFFIXES lib

code/branches/kicklib/src/CMakeLists.txt

@@ -41 +41 @@
 #ADD_COMPILER_FLAGS("-DENET_DLL"           WIN32 LINK_ENET_DYNAMIC)
 ADD_COMPILER_FLAGS("-DLUA_BUILD_AS_DLL"   WIN32 LINK_LUA5.1_DYNAMIC)
-ADD_COMPILER_FLAGS("-DZLIB_DLL"           WIN32 LINK_ZLIB_DYNAMIC)
+ADD_COMPILER_FLAGS("-DZLIB_DLL -DZLIB_WINAPI" WIN32 LINK_ZLIB_DYNAMIC)
 # If no defines are specified, these libs get linked dynamically
 ADD_COMPILER_FLAGS("-DCEGUI_STATIC -DTOLUA_STATIC" WIN32 NOT LINK_CEGUI_DYNAMIC)