Changeset 1076 for code/trunk

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

Files:

• CMakeLists.txt (modified) (4 diffs)
• bin/tolua-exec-script (added)
• cmake/FindLua.cmake (modified) (4 diffs)
• src/CMakeLists.txt (modified) (1 diff)
• src/core/CMakeLists.txt (modified) (3 diffs)
• src/core/Script.cc (modified) (1 diff)
• src/core/Script_clean.h (added)
• src/core/ToLuaBind.cc (deleted)
• src/core/ToLuaBind.h (deleted)
• src/core/tolua (added)
• src/core/tolua.pkg (deleted)
• src/core/tolua/tolua.pkg (added)
• src/util/CMakeLists.txt (modified) (3 diffs)
• src/util/tolua/CMakeLists.txt (modified) (4 diffs)
• tolua-build (added)

code/trunk/CMakeLists.txt

@@ -55 +55 @@
 # FIND_PACKAGE(CEGUI_OGRE)
 FIND_PACKAGE(ENet)
-FIND_PACKAGE(Boost REQUIRED thread)
+FIND_PACKAGE(Boost)
 FIND_PACKAGE(OpenAL)
 FIND_PACKAGE(ALUT)
@@ -70 +70 @@
   ${Boost_LIBRARY_DIRS}
   ${Zlib_LIBRARY_DIR}
-  ${Lua_LIBRARIES}
-#  core objects loader network weapon classHierarchy audio
 )
 
@@ -81 +79 @@
   ${ENet_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS}
-#  ${OPENAL_INCLUDE_DIR} ${ALUT_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR} ${OGG_INCLUDE_DIR}
+  ${OPENAL_INCLUDE_DIR} ${ALUT_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR} ${OGG_INCLUDE_DIR}
   ${Lua_INCLUDE_DIR}
 )
@@ -88 +86 @@
 ################ Source files ###################
 
+#At first, build lua
+MESSAGE(STATUS "\n******************* Building tolua... ******************\n\n")
+EXECUTE_PROCESS(COMMAND ./tolua-build)
+MESSAGE(STATUS "\n\n******************* Building tolua done ****************\n")
+
+#generate lua bind source files
+EXECUTE_PROCESS(COMMAND bin/./tolua-exec-script)
+EXECUTE_PROCESS(COMMAND ls)
+
 #add main source dir
 ADD_SUBDIRECTORY(src)
+

code/trunk/cmake/FindLua.cmake

@@ -11 +11 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 
+MESSAGE(STATUS "lua libs in cache: ${Lua_LIBRARIES}")
 IF (Lua_LIBRARIES AND Lua_INCLUDE_DIR)
     SET(Lua_FIND_QUIETLY TRUE) # Already in cache, be silent
@@ -26 +27 @@
 
 IF (NOT Lua_INCLUDE_DIR)
-FIND_PATH(Lua_INCLUDE_DIR lua.h
+ FIND_PATH(Lua_INCLUDE_DIR lua.h
         /usr/include/lua50
         /usr/local/include/lua50
@@ -33 +34 @@
 
 IF (NOT Lua_LIBRARIES)
-FIND_LIBRARY(Lua_LIBRARIES lua50
+ FIND_LIBRARY(Lua_LIBRARIES lua50
         /usr/lib
         /usr/local/lib)
 
-FIND_LIBRARY(Lua_LIBRARY lualib50
+ FIND_LIBRARY(Lua_LIBRARY lualib50
         /usr/lib
         /usr/local/lib)
 
-SET(Lua_LIBRARIES ${Lua_LIBRARIES} ${Lua_LIBRARY})
-
+#SET(Lua_LIBRARIES ${Lua_LIBRARIES} ${Lua_LIBRARY})
 ENDIF (NOT Lua_LIBRARIES)
 
+#especially for tardis
 IF (NOT Lua_LIBRARIES)
-FIND_LIBRARY(Lua_LIBRARIES lua
+ FIND_LIBRARY(Lua_LIBRARIES lua
         /usr/pack/lua-5.0.3-sd/i686-debian-linux3.1/lib)
 
-FIND_LIBRARY(Lua_LIBRARY lualib
+ FIND_LIBRARY(Lua_LIBRARY lualib
         /usr/pack/lua-5.0.3-sd/i686-debian-linux3.1/lib)
 
-SET(Lua_LIBRARIES ${Lua_LIBRARIES} ${Lua_LIBRARY})
-
+#SET(Lua_LIBRARIES ${Lua_LIBRARIES} ${Lua_LIBRARY})
 ENDIF (NOT Lua_LIBRARIES)
 
@@ -62 +62 @@
 IF (Lua_FOUND)
     MESSAGE(STATUS "Found Lua: ${Lua_LIBRARIES}")
+    MESSAGE(STATUS "Found Lua: ${Lua_LIBRARY}")
 ELSE (Lua_FOUND)
     IF (Lua_FIND_REQUIRED)

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
 )