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.
Showing
- cmake/Modules/FindJson.cmake 2 additions, 2 deletionscmake/Modules/FindJson.cmake
- src/convert_json.h 1 addition, 1 deletionsrc/convert_json.h
- src/jsoncpp/json/CMakeLists.txt 0 additions, 0 deletionssrc/jsoncpp/json/CMakeLists.txt
- src/jsoncpp/json/UPDATING 0 additions, 0 deletionssrc/jsoncpp/json/UPDATING
- src/jsoncpp/json/json.h 0 additions, 0 deletionssrc/jsoncpp/json/json.h
- src/jsoncpp/json/jsoncpp.cpp 0 additions, 0 deletionssrc/jsoncpp/json/jsoncpp.cpp
- src/mods.h 1 addition, 1 deletionsrc/mods.h
- src/script/common/c_content.cpp 6 additions, 1 deletionsrc/script/common/c_content.cpp
- src/script/lua_api/l_util.cpp 1 addition, 1 deletionsrc/script/lua_api/l_util.cpp
- src/serverlist.cpp 1 addition, 1 deletionsrc/serverlist.cpp
- src/serverlist.h 1 addition, 1 deletionsrc/serverlist.h
Loading
Please register or sign in to comment