Changeset 1810 for code/trunk/src/orxonox/CMakeLists.txt

Timestamp:

Sep 21, 2008, 8:44:25 PM (16 years ago)

Author:

rgrieder

Message:

merged ceguilua branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/CMakeLists.txt (modified) (2 diffs)

code/trunk/src/orxonox/CMakeLists.txt

@@ -66 +66 @@
 )
 
-GET_TARGET_PROPERTY(TOLUA_EXE tolua LOCATION)
+GET_TARGET_PROPERTY(TOLUA_EXE tolua_orxonox LOCATION)
 ADD_CUSTOM_COMMAND(
   OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc
@@ -97 +97 @@
 TARGET_LINK_LIBRARIES( orxonox
   ${OGRE_LIBRARIES}
-  ${Lua_LIBRARIES}
   ${CEGUI_LIBRARIES}
-  ${CEGUI_SCRIPT_LIBRARIES}
-  tinyxml
-  tolualib
+  lua_orxonox
+  ceguilua_orxonox
+  tinyxml_orxonox
+  tolualib_orxonox
   ois_orxonox
   util