Changeset 2275 for code/branches/buildsystem

Timestamp:

Nov 26, 2008, 4:31:35 PM (16 years ago)

Author:

adrfried

Message:

prepared tolua for different lua versions

Location:

code/branches/buildsystem/src/tolua

Files:

• CMakeLists.txt (modified) (1 diff)
• all-5.0.lua (copied) (copied from code/branches/buildsystem/src/tolua/all.lua) (1 diff)
• all-5.1.lua (moved) (moved from code/branches/buildsystem/src/tolua/all.lua)

code/branches/buildsystem/src/tolua/CMakeLists.txt

@@ -18 +18 @@
 TARGET_LINK_LIBRARIES(toluaexe_orxonox tolualib_orxonox ${LUA_LIBRARIES})
 
-SET(TOLUA_PARSER_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/all.lua" PARENT_SCOPE)
+# TODO: determine lua version and set appropriate pack file
+SET(TOLUA_ALL_PACK all-5.1.lua)
+SET(TOLUA_PARSER_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/${TOLUA_ALL_PACK}" PARENT_SCOPE)
 SET(TOLUA_PARSER_DEPENDENCIES
-  ${CMAKE_CURRENT_SOURCE_DIR}/all.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/${TOLUA_ALL_PACK}
   ${CMAKE_CURRENT_SOURCE_DIR}/lua/compat-5.1.lua
   ${CMAKE_CURRENT_SOURCE_DIR}/lua/compat.lua

code/branches/buildsystem/src/tolua/all-5.0.lua

@@ -1 @@
-dofile(path.."lua/compat-5.1.lua")
 dofile(path.."lua/compat.lua")
 dofile(path.."lua/basic.lua")