Changeset 1153 for code/trunk
- Timestamp:
- Apr 24, 2008, 10:35:53 AM (17 years ago)
- Location:
- code/trunk
- Files:
-
- 1 deleted
- 9 edited
- 19 copied
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/cmake/FindLua.cmake
r1126 r1153 28 28 /usr/pack/lua-5.0.3-sd/include) 29 29 30 FIND_LIBRARY(Lua_LIBRARY_51 lua5.130 FIND_LIBRARY(Lua_LIBRARY_51 NAMES lua5.1 lua PATHS 31 31 /usr/lib 32 32 /usr/local/lib -
code/trunk/src/CMakeLists.txt
r1115 r1153 1 1 INCLUDE_DIRECTORIES(.) 2 2 INCLUDE_DIRECTORIES(orxonox) 3 INCLUDE_DIRECTORIES( tolua)3 INCLUDE_DIRECTORIES(util/tolua) 4 4 5 ADD_SUBDIRECTORY(tolua)6 5 ADD_SUBDIRECTORY(util) 7 6 ADD_SUBDIRECTORY(core) -
code/trunk/src/core/CMakeLists.txt
r1126 r1153 26 26 Tickable.cc 27 27 Script.cc 28 tolua/tolua_bind.cc 29 #tolua/tolua_bind.h 30 ) 31 32 #SET_SOURCE_FILES_PROPERTIES(tolua/tolua_bind.h 33 # PROPERTIES 34 # OBJECT_DEPENDS tolua/tolua_bind.h 35 # OBJECT_DEPENDS tolua/tolua_bind.cc 36 # GENERATED true 37 # HEADER_FILE_ONLY true 38 #) 39 40 GET_TARGET_PROPERTY(TOLUA_EXE tolua LOCATION) 41 ADD_CUSTOM_COMMAND( 42 OUTPUT tolua/tolua_bind.cc tolua/tolua_bind.h 43 COMMAND ${TOLUA_EXE} -n core -o ../../src/core/tolua/tolua_bind.cc -H ../../src/core/tolua/tolua_bind.h ../../src/core/tolua/tolua.pkg 44 DEPENDS tolua 45 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib 28 46 ) 29 47 … … 31 49 32 50 TARGET_LINK_LIBRARIES(core 33 util34 tolualib35 51 ${Lua_LIBRARIES} 36 52 ${OIS_LIBRARIES} 53 ${OGRE_LIBRARIES} 54 util 37 55 ) -
code/trunk/src/core/Script.cc
r1115 r1153 39 39 } 40 40 41 #include "tolua /tolua++.h"41 #include "tolua++.h" 42 42 #include "tolua/tolua_bind.h" 43 43 … … 60 60 luaopen_debug(luaState_); 61 61 #endif 62 tolua_ orxonox_open(luaState_);62 tolua_core_open(luaState_); 63 63 output_ = ""; 64 64 } -
code/trunk/src/orxonox/CMakeLists.txt
r1070 r1153 30 30 # objects/weapon/BulletManager.cc 31 31 # objects/weapon/WeaponStation.cc 32 tolua/tolua_bind.cc 33 # tolua/tolua_bind.h 32 34 ) 33 35 36 #SET_SOURCE_FILES_PROPERTIES(tolua/tolua_bind.h 37 # PROPERTIES 38 # OBJECT_DEPENDS tolua/tolua_bind.h 39 # OBJECT_DEPENDS tolua/tolua_bind.cc 40 # GENERATED true 41 # HEADER_FILE_ONLY true 42 #) 43 44 GET_TARGET_PROPERTY(TOLUA_EXE tolua LOCATION) 45 ADD_CUSTOM_COMMAND( 46 OUTPUT tolua/tolua_bind.cc tolua/tolua_bind.h 47 COMMAND ${TOLUA_EXE} -n orxonox -o ../../src/orxonox/tolua/tolua_bind.cc -H ../../src/orxonox/tolua/tolua_bind.h ../../src/orxonox/tolua/tolua.pkg 48 DEPENDS tolua 49 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib 50 ) 51 34 52 ADD_EXECUTABLE( orxonox ${ORXONOX_SRC_FILES} ) 35 53 -
code/trunk/src/util/CMakeLists.txt
r1120 r1153 1 AUX_SOURCE_DIRECTORY(tinyxml TINYXML_SRC_FILES)2 3 1 SET(UTIL_SRC_FILES 4 2 ArgReader.cc 3 Clipboard.cc 4 ExprParser.cc 5 5 Math.cc 6 String.cc7 Clipboard.cc8 SubString.cc9 ExprParser.cc10 6 MultiTypePrimitive.cc 11 7 MultiTypeString.cc 12 8 MultiTypeMath.cc 13 ${TINYXML_SRC_FILES} 9 String.cc 10 SubString.cc 11 12 tinyxml/ticpp.cc 13 tinyxml/tinystr.cc 14 tinyxml/tinyxml.cc 15 tinyxml/tinyxmlerror.cc 16 tinyxml/tinyxmlparser.cc 17 18 tolua/tolua_event.c 19 tolua/tolua_is.c 20 tolua/tolua_map.c 21 tolua/tolua_push.c 22 tolua/tolua_to.c 14 23 ) 15 24 … … 22 31 TARGET_LINK_LIBRARIES(util 23 32 ${OGRE_LIBRARIES} 33 ${Lua_LIBRARIES} 24 34 ) 25 35 36 ADD_SUBDIRECTORY(tolua) 37 -
code/trunk/visual_studio/vc8/core.vcproj
r1126 r1153 252 252 > 253 253 </File> 254 <Filter 255 Name="tolua" 256 > 257 <File 258 RelativePath="..\..\src\core\tolua\tolua_bind.cc" 259 > 260 </File> 261 </Filter> 254 262 </Filter> 255 263 <Filter … … 410 418 > 411 419 </File> 420 <Filter 421 Name="tolua" 422 > 423 <File 424 RelativePath="..\..\src\core\tolua\tolua_bind.h" 425 > 426 </File> 427 </Filter> 412 428 </Filter> 413 429 </Files> -
code/trunk/visual_studio/vc8/orxonox.vcproj
r1035 r1153 384 384 </File> 385 385 </Filter> 386 <Filter 387 Name="tolua" 388 > 389 <File 390 RelativePath="..\..\src\orxonox\tolua\tolua_bind.cc" 391 > 392 <FileConfiguration 393 Name="Debug|Win32" 394 > 395 <Tool 396 Name="VCCLCompilerTool" 397 UsePrecompiledHeader="0" 398 /> 399 </FileConfiguration> 400 </File> 401 </Filter> 386 402 </Filter> 387 403 <Filter … … 511 527 <File 512 528 RelativePath="..\..\src\orxonox\tools\Timer.h" 529 > 530 </File> 531 </Filter> 532 <Filter 533 Name="tolua" 534 > 535 <File 536 RelativePath="..\..\src\orxonox\tolua\tolua_bind.h" 513 537 > 514 538 </File> -
code/trunk/visual_studio/vc8/tolua++.vcproj
r1126 r1153 131 131 > 132 132 <File 133 RelativePath="..\..\src\ tolua\tolua_bind.cc"133 RelativePath="..\..\src\util\tolua\tolua_event.c" 134 134 > 135 135 </File> 136 136 <File 137 RelativePath="..\..\src\ tolua\tolua_event.c"137 RelativePath="..\..\src\util\tolua\tolua_is.c" 138 138 > 139 139 </File> 140 140 <File 141 RelativePath="..\..\src\ tolua\tolua_is.c"141 RelativePath="..\..\src\util\tolua\tolua_map.c" 142 142 > 143 143 </File> 144 144 <File 145 RelativePath="..\..\src\ tolua\tolua_map.c"145 RelativePath="..\..\src\util\tolua\tolua_push.c" 146 146 > 147 147 </File> 148 148 <File 149 RelativePath="..\..\src\tolua\tolua_push.c" 150 > 151 </File> 152 <File 153 RelativePath="..\..\src\tolua\tolua_to.c" 149 RelativePath="..\..\src\util\tolua\tolua_to.c" 154 150 > 155 151 </File> … … 161 157 > 162 158 <File 163 RelativePath="..\..\src\ tolua\tolua++.h"159 RelativePath="..\..\src\util\tolua\tolua++.h" 164 160 > 165 161 </File> 166 162 <File 167 RelativePath="..\..\src\tolua\tolua_bind.h" 168 > 169 </File> 170 <File 171 RelativePath="..\..\src\tolua\tolua_event.h" 163 RelativePath="..\..\src\util\tolua\tolua_event.h" 172 164 > 173 165 </File>
Note: See TracChangeset
for help on using the changeset viewer.