1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00

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
This commit is contained in:
Loïc Blot 2017-04-02 10:51:50 +02:00 committed by GitHub
parent 75fb3e4730
commit 86b1542181
75 changed files with 6986 additions and 6345 deletions

View file

@ -0,0 +1,7 @@
if(MSVC)
set(CMAKE_CXX_FLAGS_RELEASE "/MT /O2 /Ob2 /D NDEBUG")
endif()
add_library(jsoncpp jsoncpp.cpp)
target_link_libraries(jsoncpp)

16
lib/jsoncpp/json/UPDATING Normal file
View file

@ -0,0 +1,16 @@
#!/bin/sh
cd ..
svn co https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp jsoncpp
svn up jsoncpp
cd jsoncpp
python amalgamate.py
cp -R dist/json ..
cp dist/jsoncpp.cpp ../json
# maybe you need to patch:
# src/json/jsoncpp.cpp:
# -#include <json/json.h>
# +#include "json/json.h"
#svn export --force https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/src/lib_json json
#svn export --force https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/include/json json

1981
lib/jsoncpp/json/json.h Normal file

File diff suppressed because it is too large Load diff

4937
lib/jsoncpp/jsoncpp.cpp Normal file

File diff suppressed because it is too large Load diff