]> git.lizzy.rs Git - dragonfireclient.git/commit
Fixes for compiling with a newer (system) jsoncpp (#4429)
authorRogier-5 <Rogier-5@users.noreply.github.com>
Wed, 10 Aug 2016 10:10:00 +0000 (12:10 +0200)
committerest31 <est31@users.noreply.github.com>
Wed, 10 Aug 2016 10:10:00 +0000 (12:10 +0200)
commit4503b5097f99d2806763650f33d8ef3b49f77ce4
treed682a8b3ac13c79ece798ae05b9546ecfa770382
parent058a869b70072aba8baea47e359c45e82daaf152
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.
15 files changed:
cmake/Modules/FindJson.cmake
src/convert_json.h
src/json/CMakeLists.txt [deleted file]
src/json/UPDATING [deleted file]
src/json/json.h [deleted file]
src/json/jsoncpp.cpp [deleted file]
src/jsoncpp/json/CMakeLists.txt [new file with mode: 0644]
src/jsoncpp/json/UPDATING [new file with mode: 0644]
src/jsoncpp/json/json.h [new file with mode: 0644]
src/jsoncpp/json/jsoncpp.cpp [new file with mode: 0644]
src/mods.h
src/script/common/c_content.cpp
src/script/lua_api/l_util.cpp
src/serverlist.cpp
src/serverlist.h