From 4503b5097f99d2806763650f33d8ef3b49f77ce4 Mon Sep 17 00:00:00 2001 From: Rogier-5 Date: Wed, 10 Aug 2016 12:10:00 +0200 Subject: 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. --- src/json/UPDATING | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 src/json/UPDATING (limited to 'src/json/UPDATING') diff --git a/src/json/UPDATING b/src/json/UPDATING deleted file mode 100644 index d00076601..000000000 --- a/src/json/UPDATING +++ /dev/null @@ -1,16 +0,0 @@ -#!/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 -# +#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 -- cgit v1.2.3