Changeset 1153 for code/trunk/src/core

Timestamp:

Apr 24, 2008, 10:35:53 AM (16 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/core

Files:

• CMakeLists.txt (modified) (2 diffs)
• Script.cc (modified) (2 diffs)
• tolua (copied) (copied from code/branches/cmake/src/core/tolua)
• tolua/tolua.pkg (copied) (copied from code/branches/cmake/src/core/tolua/tolua.pkg)

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_ = "";
   }