Changeset 1076 for code/trunk/src/core

Timestamp:

Apr 16, 2008, 10:05:37 AM (17 years ago)

Author:

rgrieder

Message:

two hours of Fuk is very 'enlighting', the whole thing works now.\ncmake. will now build lua, then compile with tolua and finally create the Makefiles for orxonox.\n

Location:

code/trunk/src/core

Files:

• CMakeLists.txt (modified) (3 diffs)
• Script.cc (modified) (1 diff)
• Script_clean.h (added)
• ToLuaBind.cc (deleted)
• ToLuaBind.h (deleted)
• tolua (added)
• tolua.pkg (deleted)
• tolua/tolua.pkg (added)

code/trunk/src/core/CMakeLists.txt

@@ +1 @@
+#get the created files
+AUX_SOURCE_DIRECTORY(tolua TOLUA_BIND_FILES) 
+
+MESSAGE(STATUS "tolua sources: ${TOLUA_BIND_FILES}")
+
 SET( CORE_SRC_FILES
   OrxonoxClass.cc
@@ -26 +31 @@
   Tickable.cc
   Script.cc
-  ToLuaBind.cc
+  ${TOLUA_BIND_FILES}
 )
 
@@ -34 +39 @@
   util
   ${Lua_LIBRARIES}
+  ${Lua_LIBRARY}
   ${OIS_LIBRARIES}
 )

code/trunk/src/core/Script.cc

@@ -39 +39 @@
 }
 
-#include "util/tolua/tolua++.h"
-#include "ToLuaBind.h"
+#include "tolua++.h"
+#include "tolua/tolua_bind.h"
 
 namespace orxonox