Changeset 1076 for code/trunk/src

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

Files:

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

code/trunk/src/CMakeLists.txt

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

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

code/trunk/src/util/CMakeLists.txt

@@ -1 +1 @@
 AUX_SOURCE_DIRECTORY(tinyxml TINYXML_SRC_FILES)
+AUX_SOURCE_DIRECTORY(tolua   TOLUA_SRC_FILES)
 
 SET (UTIL_SRC_FILES
@@ -11 +12 @@
   MultiTypeMath.cc
   ${TINYXML_SRC_FILES}
+  ${TOLUA_SRC_FILES}
 )
 
@@ -21 +23 @@
 TARGET_LINK_LIBRARIES( util
   ${OGRE_LIBRARIES}
-)
+  ${Lua_LIBRARIES}
+  ${Lua_LIBRARY}
+) 
+

code/trunk/src/util/tolua/CMakeLists.txt

@@ -2 +2 @@
 
 #This sets where to look for modules (e.g. "Find*.cmake" files)
-SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
+SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/)
 
 #Check whether we are on a tardis box
@@ -17 +17 @@
 
 #set binary output directories
-SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
-SET(LIBRARY_OUTPUT_PATH    ${PROJECT_BINARY_DIR}/bin/lib)
+SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/../../../bin)
+SET(LIBRARY_OUTPUT_PATH    ${PROJECT_BINARY_DIR}/../../../bin)
 
 # global compiler/linker flags. force -O2!
@@ -39 +39 @@
 #Set the search paths for the linking
 LINK_DIRECTORIES(
-  ${Lua_LIBRARIES}
-  m
 )
 
@@ -65 +63 @@
 TARGET_LINK_LIBRARIES( tolua
   ${Lua_LIBRARIES}
+  ${Lua_LIBRARY}
+  m
 )