diff options
| author | RealBadAngel <mk@realbadangel.pl> | 2013-04-07 20:35:48 +0200 |
|---|---|---|
| committer | PilzAdam <pilzadam@minetest.net> | 2013-04-08 22:10:00 +0200 |
| commit | 94490268396644cc783cb0b16d1214ad52319d28 (patch) | |
| tree | 5a0e8472a27246225a790018e2ff61e1cd9778e5 | |
| parent | e7247c1a66e2a61d5b4a97d9cab02194b97de53b (diff) | |
| download | minetest-94490268396644cc783cb0b16d1214ad52319d28.tar.gz minetest-94490268396644cc783cb0b16d1214ad52319d28.tar.bz2 minetest-94490268396644cc783cb0b16d1214ad52319d28.zip | |
Use system wide LuaJIT if aviable.
| -rw-r--r-- | builtin/serialize.lua | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 29 |
2 files changed, 21 insertions, 10 deletions
diff --git a/builtin/serialize.lua b/builtin/serialize.lua index ecb2438e8..61b923ce4 100644 --- a/builtin/serialize.lua +++ b/builtin/serialize.lua @@ -197,7 +197,7 @@ local function unit_test() unitTest("test 1b", unittest_input.cat.speed == unittest_output.cat.speed) unitTest("test 1c", unittest_input.dog.sound == unittest_output.dog.sound) - unittest_input = {escapechars="\n\r\t\v\\\"\'\[\]", noneuropean="θשׁ٩∂"} + unittest_input = {escapechars="\n\r\t\v\\\"\'", noneuropean="θשׁ٩∂"} unittest_output = minetest.deserialize(minetest.serialize(unittest_input)) unitTest("test 3a", unittest_input.escapechars == unittest_output.escapechars) unitTest("test 3b", unittest_input.noneuropean == unittest_output.noneuropean) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9bef3289e..62bb42b9e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -180,10 +180,26 @@ if(USE_FREETYPE) set(CGUITTFONT_LIBRARY cguittfont) endif(USE_FREETYPE) -# Do not use system-wide installation of Lua, because it'll likely be a -# different version and/or has different build options. -set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src") -set(LUA_LIBRARY "lua") + +find_library(LUA_LIBRARY luajit + NAMES luajit-5.1) +find_path(LUA_INCLUDE_DIR luajit.h + NAMES luajit.h + PATH_SUFFIXES luajit-2.0) +message (STATUS "LuaJIT library: ${LUA_LIBRARY}") +message (STATUS "LuaJIT headers: ${LUA_INCLUDE_DIR}") + +if(LUA_LIBRARY AND LUA_INCLUDE_DIR) + message (STATUS "LuaJIT found.") +else(LUA_LIBRARY AND LUA_INCLUDE_DIR) + message (STATUS "LuaJIT not found, using bundled Lua.") + set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src") + set(LUA_LIBRARY "lua") + add_subdirectory(lua) +endif(LUA_LIBRARY AND LUA_INCLUDE_DIR) + +mark_as_advanced(LUA_LIBRARY) +mark_as_advanced(LUA_INCLUDE_DIR) configure_file( "${PROJECT_SOURCE_DIR}/cmake_config.h.in" @@ -601,11 +617,6 @@ if (BUILD_CLIENT AND USE_FREETYPE) add_subdirectory(cguittfont) endif (BUILD_CLIENT AND USE_FREETYPE) -if (LUA_FOUND) -else (LUA_FOUND) - add_subdirectory(lua) -endif (LUA_FOUND) - if (JSON_FOUND) else (JSON_FOUND) add_subdirectory(json) |