-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update embedded jsoncpp from unk version to 0.10.6 + move libs to lib…
…/ instead of src/ (#5473) * Update embedded jsoncpp from unk version to 0.10.6 0.10.6 is last release without c++11 * Make jsoncpp more compliant with its amalgamate Jsoncpp cpp file should be upper, make the library like it does in amalgamate * Reorganization: move minetest embedded libs outside of source tree to /lib * Fix a dead grep in LINT
- Loading branch information
Showing
75 changed files
with
6,986 additions
and
6,345 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
# LuaJIT | ||
option(ENABLE_LUAJIT "Enable LuaJIT support" TRUE) | ||
set(USE_LUAJIT FALSE PARENT_SCOPE) | ||
if(ENABLE_LUAJIT) | ||
find_package(LuaJIT) | ||
if(LUAJIT_FOUND) | ||
set(USE_LUAJIT TRUE) | ||
set(USE_LUAJIT TRUE PARENT_SCOPE) | ||
message (STATUS "Using LuaJIT provided by system.") | ||
endif(LUAJIT_FOUND) | ||
else() | ||
message (STATUS "LuaJIT detection disabled! (ENABLE_LUAJIT=0)") | ||
endif() | ||
|
||
if(NOT USE_LUAJIT) | ||
message(STATUS "LuaJIT not found, using bundled Lua.") | ||
set(LUA_LIBRARY lua PARENT_SCOPE) | ||
set(LUA_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lua/src PARENT_SCOPE) | ||
add_subdirectory(lua) | ||
endif() | ||
|
||
find_package(GMP REQUIRED) | ||
find_package(Json REQUIRED) |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Oops, something went wrong.