Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Use system wide LuaJIT if aviable.
- Loading branch information
Showing
with
21 additions
and
10 deletions.
-
+1
−1
builtin/serialize.lua
-
+20
−9
src/CMakeLists.txt
|
@@ -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) |
|
|
|
@@ -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) |
|
|