Changeset 1153 for code/trunk/src

Timestamp:

Apr 24, 2008, 10:35:53 AM (17 years ago)

Author:

rgrieder

Message:

• merged cmake branch back to trunk (the last one, hopefully )
• added Oli's lua library name (liblua.so)

Location:

code/trunk/src

Files:

• CMakeLists.txt (modified) (1 diff)
• core/CMakeLists.txt (modified) (2 diffs)
• core/Script.cc (modified) (2 diffs)
• core/tolua (copied) (copied from code/branches/cmake/src/core/tolua)
• core/tolua/tolua.pkg (copied) (copied from code/branches/cmake/src/core/tolua/tolua.pkg)
• orxonox/CMakeLists.txt (modified) (1 diff)
• orxonox/tolua (copied) (copied from code/branches/cmake/src/orxonox/tolua)
• orxonox/tolua/tolua.pkg (copied) (copied from code/branches/cmake/src/orxonox/tolua/tolua.pkg)
• tolua (deleted)
• util/CMakeLists.txt (modified) (2 diffs)
• util/tolua (copied) (copied from code/branches/cmake/src/util/tolua)
• util/tolua/CMakeLists.txt (copied) (copied from code/branches/cmake/src/util/tolua/CMakeLists.txt)
• util/tolua/tolua++.h (copied) (copied from code/branches/cmake/src/util/tolua/tolua++.h)
• util/tolua/tolua.c (copied) (copied from code/branches/cmake/src/util/tolua/tolua.c)
• util/tolua/tolua_bind.cc (copied) (copied from code/branches/cmake/src/util/tolua/tolua_bind.cc)
• util/tolua/tolua_bind.h (copied) (copied from code/branches/cmake/src/util/tolua/tolua_bind.h)
• util/tolua/tolua_event.c (copied) (copied from code/branches/cmake/src/util/tolua/tolua_event.c)
• util/tolua/tolua_event.h (copied) (copied from code/branches/cmake/src/util/tolua/tolua_event.h)
• util/tolua/tolua_is.c (copied) (copied from code/branches/cmake/src/util/tolua/tolua_is.c)
• util/tolua/tolua_map.c (copied) (copied from code/branches/cmake/src/util/tolua/tolua_map.c)
• util/tolua/tolua_push.c (copied) (copied from code/branches/cmake/src/util/tolua/tolua_push.c)
• util/tolua/tolua_to.c (copied) (copied from code/branches/cmake/src/util/tolua/tolua_to.c)
• util/tolua/toluabind.c (copied) (copied from code/branches/cmake/src/util/tolua/toluabind.c)
• util/tolua/toluabind.h (copied) (copied from code/branches/cmake/src/util/tolua/toluabind.h)
• util/tolua/toluabind_default.h (copied) (copied from code/branches/cmake/src/util/tolua/toluabind_default.h)

code/trunk/src/CMakeLists.txt

@@ -1 +1 @@
 INCLUDE_DIRECTORIES(.)
 INCLUDE_DIRECTORIES(orxonox)
-INCLUDE_DIRECTORIES(tolua)
+INCLUDE_DIRECTORIES(util/tolua)
 
-ADD_SUBDIRECTORY(tolua)
 ADD_SUBDIRECTORY(util)
 ADD_SUBDIRECTORY(core)

code/trunk/src/core/CMakeLists.txt

@@ -26 +26 @@
   Tickable.cc
   Script.cc
+  tolua/tolua_bind.cc
+#tolua/tolua_bind.h
+)
+
+#SET_SOURCE_FILES_PROPERTIES(tolua/tolua_bind.h
+#  PROPERTIES
+#  OBJECT_DEPENDS tolua/tolua_bind.h
+#  OBJECT_DEPENDS tolua/tolua_bind.cc
+#  GENERATED true
+#  HEADER_FILE_ONLY true
+#)
+
+GET_TARGET_PROPERTY(TOLUA_EXE tolua LOCATION)
+ADD_CUSTOM_COMMAND(
+  OUTPUT tolua/tolua_bind.cc tolua/tolua_bind.h
+  COMMAND ${TOLUA_EXE} -n core -o ../../src/core/tolua/tolua_bind.cc -H ../../src/core/tolua/tolua_bind.h ../../src/core/tolua/tolua.pkg
+  DEPENDS tolua
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
 )
 
@@ -31 +49 @@
 
 TARGET_LINK_LIBRARIES(core
-  util
-  tolualib
   ${Lua_LIBRARIES}
   ${OIS_LIBRARIES}
+  ${OGRE_LIBRARIES}
+  util
 )

code/trunk/src/core/Script.cc

@@ -39 +39 @@
 }
 
-#include "tolua/tolua++.h"
+#include "tolua++.h"
 #include "tolua/tolua_bind.h"
 
@@ -60 +60 @@
     luaopen_debug(luaState_);
 #endif
-    tolua_orxonox_open(luaState_);
+    tolua_core_open(luaState_);
     output_ = "";
   }

code/trunk/src/orxonox/CMakeLists.txt

@@ -30 +30 @@
 #  objects/weapon/BulletManager.cc
 #  objects/weapon/WeaponStation.cc
+  tolua/tolua_bind.cc
+#  tolua/tolua_bind.h
 )
 
+#SET_SOURCE_FILES_PROPERTIES(tolua/tolua_bind.h
+#  PROPERTIES
+#  OBJECT_DEPENDS tolua/tolua_bind.h
+#  OBJECT_DEPENDS tolua/tolua_bind.cc
+#  GENERATED true
+#  HEADER_FILE_ONLY true
+#)
+
+GET_TARGET_PROPERTY(TOLUA_EXE tolua LOCATION)
+ADD_CUSTOM_COMMAND(
+  OUTPUT tolua/tolua_bind.cc tolua/tolua_bind.h
+  COMMAND ${TOLUA_EXE} -n orxonox -o ../../src/orxonox/tolua/tolua_bind.cc -H ../../src/orxonox/tolua/tolua_bind.h ../../src/orxonox/tolua/tolua.pkg
+  DEPENDS tolua
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
+)
+        
 ADD_EXECUTABLE( orxonox ${ORXONOX_SRC_FILES} )
 

code/trunk/src/util/CMakeLists.txt

@@ -1 @@
-AUX_SOURCE_DIRECTORY(tinyxml TINYXML_SRC_FILES)
-
 SET(UTIL_SRC_FILES
   ArgReader.cc
+  Clipboard.cc
+  ExprParser.cc
   Math.cc
-  String.cc
-  Clipboard.cc
-  SubString.cc
-  ExprParser.cc
   MultiTypePrimitive.cc
   MultiTypeString.cc
   MultiTypeMath.cc
-  ${TINYXML_SRC_FILES}
+  String.cc
+  SubString.cc
+
+  tinyxml/ticpp.cc
+  tinyxml/tinystr.cc
+  tinyxml/tinyxml.cc
+  tinyxml/tinyxmlerror.cc
+  tinyxml/tinyxmlparser.cc
+
+  tolua/tolua_event.c
+  tolua/tolua_is.c
+  tolua/tolua_map.c
+  tolua/tolua_push.c
+  tolua/tolua_to.c
 )
 
@@ -22 +31 @@
 TARGET_LINK_LIBRARIES(util
   ${OGRE_LIBRARIES}
+  ${Lua_LIBRARIES}
 ) 
 
+ADD_SUBDIRECTORY(tolua)
+