Changeset 2630 for code/branches/buildsystem2/src

Timestamp:

Feb 1, 2009, 5:44:49 PM (16 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

Location:

code/branches/buildsystem2/src

Files:

• CMakeLists.txt (modified) (1 diff)
• audio/CMakeLists.txt (modified) (1 diff)
• core/CMakeLists.txt (modified) (1 diff)
• network/CMakeLists.txt (modified) (1 diff)

code/branches/buildsystem2/src/CMakeLists.txt

@@ -47 +47 @@
   ${ENET_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS}
-  ${OPENAL_INCLUDE_DIR}
+  ${OPENAL_INCLUDE_DIRS}
   ${ALUT_INCLUDE_DIR}
   ${VORBIS_INCLUDE_DIR}

code/branches/buildsystem2/src/audio/CMakeLists.txt

@@ -37 +37 @@
 ADD_COMPILER_FLAGS("-w44244" MSVC)
 
-IF (MINGW)
-  ADD_LIBRARY( audio ${AUDIO_FILES})
-ELSE (MINGW)
-  ADD_LIBRARY( audio SHARED ${AUDIO_FILES})
-ENDIF (MINGW)
-
+ADD_LIBRARY( audio SHARED ${AUDIO_FILES})
 SET_TARGET_PROPERTIES(audio PROPERTIES DEFINE_SYMBOL "AUDIO_SHARED_BUILD")
 TARGET_LINK_LIBRARIES( audio

code/branches/buildsystem2/src/core/CMakeLists.txt

@@ -75 +75 @@
   ${Boost_THREAD_LIBRARY}
   ${Boost_FILESYSTEM_LIBRARY}
+  ${Boost_SYSTEM_LIBRARY}    # MSVC only
+  ${Boost_DATE_TIME_LIBRARY} # MSVC only
   ${LUA_LIBRARIES}
   cpptcl_orxonox

code/branches/buildsystem2/src/network/CMakeLists.txt

@@ -39 +39 @@
 GENERATE_SOURCE_GROUPS(${NETWORK_FILES})
 
-IF(MINGW)
-  ADD_LIBRARY(network ${NETWORK_FILES})
-ELSE()
-  ADD_LIBRARY(network SHARED ${NETWORK_FILES})
-ENDIF()
-
+ADD_LIBRARY(network SHARED ${NETWORK_FILES})
 SET_TARGET_PROPERTIES(network PROPERTIES DEFINE_SYMBOL "NETWORK_SHARED_BUILD")
 TARGET_LINK_LIBRARIES(network