- Timestamp:
- Apr 16, 2008, 10:05:37 AM (17 years ago)
- Location:
- code/trunk
- Files:
-
- 5 added
- 3 deleted
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/CMakeLists.txt
r1071 r1076 55 55 # FIND_PACKAGE(CEGUI_OGRE) 56 56 FIND_PACKAGE(ENet) 57 FIND_PACKAGE(Boost REQUIRED thread)57 FIND_PACKAGE(Boost) 58 58 FIND_PACKAGE(OpenAL) 59 59 FIND_PACKAGE(ALUT) … … 70 70 ${Boost_LIBRARY_DIRS} 71 71 ${Zlib_LIBRARY_DIR} 72 ${Lua_LIBRARIES}73 # core objects loader network weapon classHierarchy audio74 72 ) 75 73 … … 81 79 ${ENet_INCLUDE_DIR} 82 80 ${Boost_INCLUDE_DIRS} 83 #${OPENAL_INCLUDE_DIR} ${ALUT_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR} ${OGG_INCLUDE_DIR}81 ${OPENAL_INCLUDE_DIR} ${ALUT_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR} ${OGG_INCLUDE_DIR} 84 82 ${Lua_INCLUDE_DIR} 85 83 ) … … 88 86 ################ Source files ################### 89 87 88 #At first, build lua 89 MESSAGE(STATUS "\n******************* Building tolua... ******************\n\n") 90 EXECUTE_PROCESS(COMMAND ./tolua-build) 91 MESSAGE(STATUS "\n\n******************* Building tolua done ****************\n") 92 93 #generate lua bind source files 94 EXECUTE_PROCESS(COMMAND bin/./tolua-exec-script) 95 EXECUTE_PROCESS(COMMAND ls) 96 90 97 #add main source dir 91 98 ADD_SUBDIRECTORY(src) 99 -
code/trunk/cmake/FindLua.cmake
r1037 r1076 11 11 # Redistribution and use is allowed according to the terms of the BSD license. 12 12 13 MESSAGE(STATUS "lua libs in cache: ${Lua_LIBRARIES}") 13 14 IF (Lua_LIBRARIES AND Lua_INCLUDE_DIR) 14 15 SET(Lua_FIND_QUIETLY TRUE) # Already in cache, be silent … … 26 27 27 28 IF (NOT Lua_INCLUDE_DIR) 28 FIND_PATH(Lua_INCLUDE_DIR lua.h29 FIND_PATH(Lua_INCLUDE_DIR lua.h 29 30 /usr/include/lua50 30 31 /usr/local/include/lua50 … … 33 34 34 35 IF (NOT Lua_LIBRARIES) 35 FIND_LIBRARY(Lua_LIBRARIES lua5036 FIND_LIBRARY(Lua_LIBRARIES lua50 36 37 /usr/lib 37 38 /usr/local/lib) 38 39 39 FIND_LIBRARY(Lua_LIBRARY lualib5040 FIND_LIBRARY(Lua_LIBRARY lualib50 40 41 /usr/lib 41 42 /usr/local/lib) 42 43 43 SET(Lua_LIBRARIES ${Lua_LIBRARIES} ${Lua_LIBRARY}) 44 44 #SET(Lua_LIBRARIES ${Lua_LIBRARIES} ${Lua_LIBRARY}) 45 45 ENDIF (NOT Lua_LIBRARIES) 46 46 47 #especially for tardis 47 48 IF (NOT Lua_LIBRARIES) 48 FIND_LIBRARY(Lua_LIBRARIES lua49 FIND_LIBRARY(Lua_LIBRARIES lua 49 50 /usr/pack/lua-5.0.3-sd/i686-debian-linux3.1/lib) 50 51 51 FIND_LIBRARY(Lua_LIBRARY lualib52 FIND_LIBRARY(Lua_LIBRARY lualib 52 53 /usr/pack/lua-5.0.3-sd/i686-debian-linux3.1/lib) 53 54 54 SET(Lua_LIBRARIES ${Lua_LIBRARIES} ${Lua_LIBRARY}) 55 55 #SET(Lua_LIBRARIES ${Lua_LIBRARIES} ${Lua_LIBRARY}) 56 56 ENDIF (NOT Lua_LIBRARIES) 57 57 … … 62 62 IF (Lua_FOUND) 63 63 MESSAGE(STATUS "Found Lua: ${Lua_LIBRARIES}") 64 MESSAGE(STATUS "Found Lua: ${Lua_LIBRARY}") 64 65 ELSE (Lua_FOUND) 65 66 IF (Lua_FIND_REQUIRED) -
code/trunk/src/CMakeLists.txt
r1055 r1076 1 1 INCLUDE_DIRECTORIES(.) 2 2 INCLUDE_DIRECTORIES(orxonox) 3 INCLUDE_DIRECTORIES(util/tolua) 3 4 4 5 ADD_SUBDIRECTORY(util) -
code/trunk/src/core/CMakeLists.txt
r1070 r1076 1 #get the created files 2 AUX_SOURCE_DIRECTORY(tolua TOLUA_BIND_FILES) 3 4 MESSAGE(STATUS "tolua sources: ${TOLUA_BIND_FILES}") 5 1 6 SET( CORE_SRC_FILES 2 7 OrxonoxClass.cc … … 26 31 Tickable.cc 27 32 Script.cc 28 ToLuaBind.cc33 ${TOLUA_BIND_FILES} 29 34 ) 30 35 … … 34 39 util 35 40 ${Lua_LIBRARIES} 41 ${Lua_LIBRARY} 36 42 ${OIS_LIBRARIES} 37 43 ) -
code/trunk/src/core/Script.cc
r1056 r1076 39 39 } 40 40 41 #include " util/tolua/tolua++.h"42 #include " ToLuaBind.h"41 #include "tolua++.h" 42 #include "tolua/tolua_bind.h" 43 43 44 44 namespace orxonox -
code/trunk/src/util/CMakeLists.txt
r1073 r1076 1 1 AUX_SOURCE_DIRECTORY(tinyxml TINYXML_SRC_FILES) 2 AUX_SOURCE_DIRECTORY(tolua TOLUA_SRC_FILES) 2 3 3 4 SET (UTIL_SRC_FILES … … 11 12 MultiTypeMath.cc 12 13 ${TINYXML_SRC_FILES} 14 ${TOLUA_SRC_FILES} 13 15 ) 14 16 … … 21 23 TARGET_LINK_LIBRARIES( util 22 24 ${OGRE_LIBRARIES} 23 ) 25 ${Lua_LIBRARIES} 26 ${Lua_LIBRARY} 27 ) 28 -
code/trunk/src/util/tolua/CMakeLists.txt
r1075 r1076 2 2 3 3 #This sets where to look for modules (e.g. "Find*.cmake" files) 4 SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} )4 SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/) 5 5 6 6 #Check whether we are on a tardis box … … 17 17 18 18 #set binary output directories 19 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/ bin)20 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/ bin/lib)19 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/../../../bin) 20 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/../../../bin) 21 21 22 22 # global compiler/linker flags. force -O2! … … 39 39 #Set the search paths for the linking 40 40 LINK_DIRECTORIES( 41 ${Lua_LIBRARIES}42 m43 41 ) 44 42 … … 65 63 TARGET_LINK_LIBRARIES( tolua 66 64 ${Lua_LIBRARIES} 65 ${Lua_LIBRARY} 66 m 67 67 )
Note: See TracChangeset
for help on using the changeset viewer.