[Orxonox-commit 3544] r8230 - in code/branches/kicklib: cmake src

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-04-11 03:37:14 +0200 (Mon, 11 Apr 2011)
New Revision: 8230

Modified:
   code/branches/kicklib/cmake/PackageConfigMSVC.cmake
   code/branches/kicklib/src/CMakeLists.txt
Log:
Zlib should now work again with MSVC < 10.

Modified: code/branches/kicklib/cmake/PackageConfigMSVC.cmake
===================================================================
--- code/branches/kicklib/cmake/PackageConfigMSVC.cmake	2011-04-10 21:50:02 UTC (rev 8229)
+++ code/branches/kicklib/cmake/PackageConfigMSVC.cmake	2011-04-11 01:37:14 UTC (rev 8230)
@@ -63,8 +63,8 @@
       CACHE FILEPATH ""
     )
     SET(ZLIB_LIBRARY
-      optimized ${DEP_LIBRARY_DIR}/zlibwapi.lib
-      debug     ${DEP_LIBRARY_DIR}/zlibwapi_d.lib
+      optimized ${DEP_LIBRARY_DIR}/zlib-vc100.lib
+      debug     ${DEP_LIBRARY_DIR}/zlib-vc100_d.lib
       CACHE FILEPATH ""
     )
   ELSE()

Modified: code/branches/kicklib/src/CMakeLists.txt
===================================================================
--- code/branches/kicklib/src/CMakeLists.txt	2011-04-10 21:50:02 UTC (rev 8229)
+++ code/branches/kicklib/src/CMakeLists.txt	2011-04-11 01:37:14 UTC (rev 8230)
@@ -40,7 +40,6 @@
 ADD_COMPILER_FLAGS("-DBOOST_ALL_DYN_LINK" WIN32 LINK_BOOST_DYNAMIC)
 #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 -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)
 ADD_COMPILER_FLAGS("-DOGRE_STATIC_LIB"    WIN32 NOT LINK_OGRE_DYNAMIC)