Changeset 2630 for code/branches/buildsystem2/cmake/LibraryConfigMSVC.cmake

Timestamp:

Feb 1, 2009, 5:44:49 PM (15 years ago)

Author:

rgrieder

Message:

Fixes:

• Improved OpenAL include hack (no, it's not hackier now, I really mean 'improved')
• Network and Audio shared linking for MinGW (using alut and openal sdk binaries now)
• TCL and ZLIB find scripts may have found the wrong library when using dependency packages (happened with MATLAB libz.dll because of the PATH variable)
• Disabled auto boost auto linking (also removes ugly hack in LibraryConfig.cmake)

Updates:

• OpenAL 1.1 for MinGW
• Ogre 1.4.9 for MinGW

File:

• code/branches/buildsystem2/cmake/LibraryConfigMSVC.cmake (modified) (1 diff)

code/branches/buildsystem2/cmake/LibraryConfigMSVC.cmake

@@ -66 +66 @@
   SET(ENV{LUA_DIR}               ${MSVC_INCLUDE_DIR}/lua-5.1.3)
   SET(ENV{OGGDIR}                ${MSVC_INCLUDE_DIR}/libogg-1.1.3)
+  SET(ENV{VORBISDIR}             ${MSVC_INCLUDE_DIR}/libvorbis-1.2.0)
   SET(ENV{OGRE_HOME}             ${MSVC_INCLUDE_DIR}/ogre-1.4.9)
   SET(ENV{OGRE_PLUGIN_DIR}       ${MSVC_BINARY_DIR})
   SET(ENV{OPENALDIR}             ${MSVC_INCLUDE_DIR}/openal-1.1)
   LIST(APPEND CMAKE_INCLUDE_PATH ${MSVC_INCLUDE_DIR}/tcl-8.5.2/include)
-  SET(ENV{VORBISDIR}             ${MSVC_INCLUDE_DIR}/libvorbis-1.2.0)
+  SET(TCL_LIBRARY                ${MSVC_LIBRARY_DIR}/tcl85.lib CACHE FILEPATH "")
   LIST(APPEND CMAKE_INCLUDE_PATH ${MSVC_INCLUDE_DIR}/zlib-1.2.3/include)
   SET(ZLIB_LIBRARY     optimized ${MSVC_LIBRARY_DIR}/zlib.lib