[Orxonox-commit 3659] r8344 - in code/branches/kicklib2/src: libraries/network libraries/tools orxonox

rgrieder at orxonox.net rgrieder at orxonox.net
Wed Apr 27 05:11:55 CEST 2011


Author: rgrieder
Date: 2011-04-27 05:11:55 +0200 (Wed, 27 Apr 2011)
New Revision: 8344

Modified:
   code/branches/kicklib2/src/libraries/network/CMakeLists.txt
   code/branches/kicklib2/src/libraries/tools/CMakeLists.txt
   code/branches/kicklib2/src/orxonox/CMakeLists.txt
Log:
Cleaned up library dependencies a little bit to list exactly those that are actually needed. (Didn't touch the modules though).

Modified: code/branches/kicklib2/src/libraries/network/CMakeLists.txt
===================================================================
--- code/branches/kicklib2/src/libraries/network/CMakeLists.txt	2011-04-27 00:38:40 UTC (rev 8343)
+++ code/branches/kicklib2/src/libraries/network/CMakeLists.txt	2011-04-27 03:11:55 UTC (rev 8344)
@@ -88,6 +88,7 @@
     #${ENET_LIBRARY}
     enet_orxonox
     ${Boost_THREAD_LIBRARY}
+    ${CEGUI_TOLUA_LIBRARY}
     util
     core
   SOURCE_FILES

Modified: code/branches/kicklib2/src/libraries/tools/CMakeLists.txt
===================================================================
--- code/branches/kicklib2/src/libraries/tools/CMakeLists.txt	2011-04-27 00:38:40 UTC (rev 8343)
+++ code/branches/kicklib2/src/libraries/tools/CMakeLists.txt	2011-04-27 03:11:55 UTC (rev 8344)
@@ -20,6 +20,12 @@
 ORXONOX_ADD_LIBRARY(tools
   FIND_HEADER_FILES
   LINK_LIBRARIES
+    ${OGRE_LIBRARY}
+    ${Boost_FILESYSTEM_LIBRARY}
+    ${Boost_SYSTEM_LIBRARY} # Filesystem dependency
+    tinyxml_orxonox
+    util
     core
-  SOURCE_FILES ${TOOLS_SRC_FILES}
+  SOURCE_FILES
+    ${TOOLS_SRC_FILES}
 )

Modified: code/branches/kicklib2/src/orxonox/CMakeLists.txt
===================================================================
--- code/branches/kicklib2/src/orxonox/CMakeLists.txt	2011-04-27 00:38:40 UTC (rev 8343)
+++ code/branches/kicklib2/src/orxonox/CMakeLists.txt	2011-04-27 03:11:55 UTC (rev 8344)
@@ -67,22 +67,21 @@
   PCH_FILE
     OrxonoxPrecompiledHeaders.h
   LINK_LIBRARIES
-    ${Boost_FILESYSTEM_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY} # Filesystem dependency
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_DATE_TIME_LIBRARY} # Thread dependency
     ${OGRE_LIBRARY}
+    ${CEGUI}
+    ${LUA5.1_LIBRARY}
+    ${CEGUI_TOLUA_LIBRARY}
     ${OPENAL_LIBRARY}
     ${ALUT_LIBRARY}
-    ${VORBISFILE_LIBRARY}
-    ${VORBIS_LIBRARY}
     ${OGG_LIBRARY}
-    ${CEGUI_TOLUA_LIBRARY}
+    ${VORBIS_LIBRARY}
+    ${VORBISFILE_LIBRARY}
     tinyxml_orxonox
     bullet_orxonox
     util
     core
     network
     tools
-  SOURCE_FILES ${ORXONOX_SRC_FILES}
+  SOURCE_FILES
+    ${ORXONOX_SRC_FILES}
 )




More information about the Orxonox-commit mailing list