aboutsummaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorBenoit Germain <bnt.germain@gmail.com>2011-02-18 20:33:43 +0100
committerBenoit Germain <bnt.germain@gmail.com>2011-02-18 20:33:43 +0100
commit1760eafa1d2ebce8f07e11414a53d4a251af5b8e (patch)
tree18f2fcd400bb35528212930c4e61be04be31bea0 /CMakeLists.txt
parentab233d0c9a1edc34836e2249c1eb6d714f1066b5 (diff)
downloadlanes-1760eafa1d2ebce8f07e11414a53d4a251af5b8e.tar.gz
lanes-1760eafa1d2ebce8f07e11414a53d4a251af5b8e.tar.bz2
lanes-1760eafa1d2ebce8f07e11414a53d4a251af5b8e.zip
* keeper.lua is now embedded in text form instead of bytecode to improve LuaJIT2-compatibility (but this is not enough).
* moved keeper-related code in a separate source file
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt8
1 files changed, 3 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index be6534c..31883fa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,13 +25,11 @@ IF(CYGWIN)
25ENDIF(CYGWIN) 25ENDIF(CYGWIN)
26 26
27#2DO - use provided bin2c 27#2DO - use provided bin2c
28# Compile Lua bytecode to C 28# Embed keeper.lua in text form in C (embedding bytecode is not LuaJIT2-compatible)
29ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/keeper.lch 29ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/keeper.lch
30 DEPENDS src/keeper.lua 30 DEPENDS src/keeper.lua
31 COMMAND "${LUAC}" "-o" "${CMAKE_CURRENT_BINARY_DIR}/keeper.lo"
32 "${CMAKE_CURRENT_SOURCE_DIR}/src/keeper.lua"
33 COMMAND "${LUA}" "${CMAKE_CURRENT_SOURCE_DIR}/tools/bin2c.lua" 31 COMMAND "${LUA}" "${CMAKE_CURRENT_SOURCE_DIR}/tools/bin2c.lua"
34 "${CMAKE_CURRENT_BINARY_DIR}/keeper.lo" 32 "${CMAKE_CURRENT_SOURCE_DIR}/src/keeper.lua"
35 "-o" "${CMAKE_CURRENT_BINARY_DIR}/keeper.lch") 33 "-o" "${CMAKE_CURRENT_BINARY_DIR}/keeper.lch")
36SET_SOURCE_FILES_PROPERTIES(src/lanes.c PROPERTIES OBJECT_DEPENDS 34SET_SOURCE_FILES_PROPERTIES(src/lanes.c PROPERTIES OBJECT_DEPENDS
37 ${CMAKE_CURRENT_BINARY_DIR}/keeper.lch) 35 ${CMAKE_CURRENT_BINARY_DIR}/keeper.lch)
@@ -40,7 +38,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
40 38
41# Build 39# Build
42INCLUDE_DIRECTORIES(src) 40INCLUDE_DIRECTORIES(src)
43ADD_LIBRARY(lua51-lanes MODULE src/lanes.c src/threading.c src/tools.c) 41ADD_LIBRARY(lua51-lanes MODULE src/lanes.c src/threading.c src/tools.c src/keeper.c)
44 42
45IF(UNIX AND NOT CYGWIN) 43IF(UNIX AND NOT CYGWIN)
46 SET(LIBS pthread) 44 SET(LIBS pthread)