diff options
| author | Rogier-5 <Rogier-5@users.noreply.github.com> | 2016-08-10 12:10:00 +0200 |
|---|---|---|
| committer | est31 <est31@users.noreply.github.com> | 2016-08-10 12:10:00 +0200 |
| commit | 4503b5097f99d2806763650f33d8ef3b49f77ce4 (patch) | |
| tree | d682a8b3ac13c79ece798ae05b9546ecfa770382 /src/jsoncpp/json/UPDATING | |
| parent | 058a869b70072aba8baea47e359c45e82daaf152 (diff) | |
| download | minetest-4503b5097f99d2806763650f33d8ef3b49f77ce4.tar.gz minetest-4503b5097f99d2806763650f33d8ef3b49f77ce4.tar.bz2 minetest-4503b5097f99d2806763650f33d8ef3b49f77ce4.zip | |
Fixes for compiling with a newer (system) jsoncpp (#4429)
* Move included json code to jsoncpp subdirectory
This is needed to avoid having to specify the minetest src directory
as a system include when fixing the json includes.
* Fix json includes
They used "", so that the compiler searches the project's directory
first. The result was that when compiling with a system jsoncpp,
the project's own version of json.h was still included, instead of
the system version.
The includes now use <>, so a system location, or one specified with
'-Ilocation' is searched only.
* Fix for jsoncpp deprecated function warning
When compiling with a newer version of jsoncpp (and
ENABLE_SYSTEM_JSONCPP=true), jsoncpp emits a warning
about a deprecated function that minetest uses.
Diffstat (limited to 'src/jsoncpp/json/UPDATING')
| -rw-r--r-- | src/jsoncpp/json/UPDATING | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/jsoncpp/json/UPDATING b/src/jsoncpp/json/UPDATING new file mode 100644 index 000000000..d00076601 --- /dev/null +++ b/src/jsoncpp/json/UPDATING @@ -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 |