Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
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
with
6,986 additions
and 6,345 deletions.
- +1 −0 CMakeLists.txt
- +33 −33 build/android/jni/Android.mk
- +5 −3 cmake/Modules/FindGMP.cmake
- +3 −4 cmake/Modules/FindJson.cmake
- +23 −0 lib/CMakeLists.txt
- 0 {src → lib}/gmp/CMakeLists.txt
- 0 {src → lib}/gmp/mini-gmp.c
- 0 {src → lib}/gmp/mini-gmp.h
- 0 {src/jsoncpp/json → lib/jsoncpp}/CMakeLists.txt
- 0 {src → lib}/jsoncpp/json/UPDATING
- +1,981 −0 lib/jsoncpp/json/json.h
- +4,937 −0 lib/jsoncpp/jsoncpp.cpp
- 0 {src → lib}/lua/CMakeLists.txt
- 0 {src → lib}/lua/COPYRIGHT
- 0 {src → lib}/lua/src/CMakeLists.txt
- 0 {src → lib}/lua/src/lapi.c
- 0 {src → lib}/lua/src/lapi.h
- 0 {src → lib}/lua/src/lauxlib.c
- 0 {src → lib}/lua/src/lauxlib.h
- 0 {src → lib}/lua/src/lbaselib.c
- 0 {src → lib}/lua/src/lcode.c
- 0 {src → lib}/lua/src/lcode.h
- 0 {src → lib}/lua/src/ldblib.c
- 0 {src → lib}/lua/src/ldebug.c
- 0 {src → lib}/lua/src/ldebug.h
- 0 {src → lib}/lua/src/ldo.c
- 0 {src → lib}/lua/src/ldo.h
- 0 {src → lib}/lua/src/ldump.c
- 0 {src → lib}/lua/src/lfunc.c
- 0 {src → lib}/lua/src/lfunc.h
- 0 {src → lib}/lua/src/lgc.c
- 0 {src → lib}/lua/src/lgc.h
- 0 {src → lib}/lua/src/linit.c
- 0 {src → lib}/lua/src/liolib.c
- 0 {src → lib}/lua/src/llex.c
- 0 {src → lib}/lua/src/llex.h
- 0 {src → lib}/lua/src/llimits.h
- 0 {src → lib}/lua/src/lmathlib.c
- 0 {src → lib}/lua/src/lmem.c
- 0 {src → lib}/lua/src/lmem.h
- 0 {src → lib}/lua/src/loadlib.c
- 0 {src → lib}/lua/src/lobject.c
- 0 {src → lib}/lua/src/lobject.h
- 0 {src → lib}/lua/src/lopcodes.c
- 0 {src → lib}/lua/src/lopcodes.h
- 0 {src → lib}/lua/src/loslib.c
- 0 {src → lib}/lua/src/lparser.c
- 0 {src → lib}/lua/src/lparser.h
- 0 {src → lib}/lua/src/lstate.c
- 0 {src → lib}/lua/src/lstate.h
- 0 {src → lib}/lua/src/lstring.c
- 0 {src → lib}/lua/src/lstring.h
- 0 {src → lib}/lua/src/lstrlib.c
- 0 {src → lib}/lua/src/ltable.c
- 0 {src → lib}/lua/src/ltable.h
- 0 {src → lib}/lua/src/ltablib.c
- 0 {src → lib}/lua/src/ltm.c
- 0 {src → lib}/lua/src/ltm.h
- 0 {src → lib}/lua/src/lua.c
- 0 {src → lib}/lua/src/lua.h
- 0 {src → lib}/lua/src/luac.c
- 0 {src → lib}/lua/src/luaconf.h
- 0 {src → lib}/lua/src/lualib.h
- 0 {src → lib}/lua/src/lundump.c
- 0 {src → lib}/lua/src/lundump.h
- 0 {src → lib}/lua/src/lvm.c
- 0 {src → lib}/lua/src/lvm.h
- 0 {src → lib}/lua/src/lzio.c
- 0 {src → lib}/lua/src/lzio.h
- 0 {src → lib}/lua/src/print.c
- +0 −21 src/CMakeLists.txt
- +0 −1,914 src/jsoncpp/json/json.h
- +0 −4,367 src/jsoncpp/json/jsoncpp.cpp
- +1 −1 src/util/srp.cpp
- +2 −2 util/travis/script.sh
| @@ -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.