diff options
| -rw-r--r-- | cmake/Modules/FindJson.cmake | 4 | ||||
| -rw-r--r-- | src/convert_json.h | 2 | ||||
| -rw-r--r-- | src/jsoncpp/json/CMakeLists.txt (renamed from src/json/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | src/jsoncpp/json/UPDATING (renamed from src/json/UPDATING) | 0 | ||||
| -rw-r--r-- | src/jsoncpp/json/json.h (renamed from src/json/json.h) | 0 | ||||
| -rw-r--r-- | src/jsoncpp/json/jsoncpp.cpp (renamed from src/json/jsoncpp.cpp) | 0 | ||||
| -rw-r--r-- | src/mods.h | 2 | ||||
| -rw-r--r-- | src/script/common/c_content.cpp | 7 | ||||
| -rw-r--r-- | src/script/lua_api/l_util.cpp | 2 | ||||
| -rw-r--r-- | src/serverlist.cpp | 2 | ||||
| -rw-r--r-- | src/serverlist.h | 2 |
11 files changed, 13 insertions, 8 deletions
diff --git a/cmake/Modules/FindJson.cmake b/cmake/Modules/FindJson.cmake index 1558b0fcf..e69d6c4c0 100644 --- a/cmake/Modules/FindJson.cmake +++ b/cmake/Modules/FindJson.cmake @@ -20,8 +20,8 @@ endif() if(NOT JSONCPP_FOUND) message(STATUS "Using bundled JSONCPP library.") - set(JSON_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/json) + set(JSON_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/jsoncpp) set(JSON_LIBRARY jsoncpp) - add_subdirectory(json) + add_subdirectory(jsoncpp/json) endif() diff --git a/src/convert_json.h b/src/convert_json.h index 6732fcfa3..55321af5f 100644 --- a/src/convert_json.h +++ b/src/convert_json.h @@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef __CONVERT_JSON_H__ #define __CONVERT_JSON_H__ -#include "json/json.h" +#include <json/json.h> struct ModStoreMod; struct ModStoreModDetails; diff --git a/src/json/CMakeLists.txt b/src/jsoncpp/json/CMakeLists.txt index 9056e4b6d..9056e4b6d 100644 --- a/src/json/CMakeLists.txt +++ b/src/jsoncpp/json/CMakeLists.txt diff --git a/src/json/UPDATING b/src/jsoncpp/json/UPDATING index d00076601..d00076601 100644 --- a/src/json/UPDATING +++ b/src/jsoncpp/json/UPDATING diff --git a/src/json/json.h b/src/jsoncpp/json/json.h index 396aafa82..396aafa82 100644 --- a/src/json/json.h +++ b/src/jsoncpp/json/json.h diff --git a/src/json/jsoncpp.cpp b/src/jsoncpp/json/jsoncpp.cpp index 7a04736de..7a04736de 100644 --- a/src/json/jsoncpp.cpp +++ b/src/jsoncpp/json/jsoncpp.cpp diff --git a/src/mods.h b/src/mods.h index 12576516d..af7777d18 100644 --- a/src/mods.h +++ b/src/mods.h @@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <vector> #include <string> #include <map> -#include "json/json.h" +#include <json/json.h> #include "config.h" #define MODNAME_ALLOWED_CHARS "abcdefghijklmnopqrstuvwxyz0123456789_" diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp index 06e20c2a0..c664101ea 100644 --- a/src/script/common/c_content.cpp +++ b/src/script/common/c_content.cpp @@ -33,7 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "porting.h" #include "mg_schematic.h" #include "noise.h" -#include "json/json.h" +#include <json/json.h> struct EnumString es_TileAnimationType[] = { @@ -1250,8 +1250,13 @@ static bool push_json_value_helper(lua_State *L, const Json::Value &value, lua_newtable(L); for (Json::Value::const_iterator it = value.begin(); it != value.end(); ++it) { +#ifndef JSONCPP_STRING const char *str = it.memberName(); lua_pushstring(L, str ? str : ""); +#else + std::string str = it.name(); + lua_pushstring(L, str.c_str()); +#endif push_json_value_helper(L, *it, nullindex); lua_rawset(L, -3); } diff --git a/src/script/lua_api/l_util.cpp b/src/script/lua_api/l_util.cpp index 95a5fc4d1..13c0d702f 100644 --- a/src/script/lua_api/l_util.cpp +++ b/src/script/lua_api/l_util.cpp @@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "common/c_content.h" #include "cpp_api/s_async.h" #include "serialization.h" -#include "json/json.h" +#include <json/json.h> #include "cpp_api/s_security.h" #include "porting.h" #include "debug.h" diff --git a/src/serverlist.cpp b/src/serverlist.cpp index de7962a68..87ca5dc04 100644 --- a/src/serverlist.cpp +++ b/src/serverlist.cpp @@ -29,7 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "porting.h" #include "log.h" #include "network/networkprotocol.h" -#include "json/json.h" +#include <json/json.h> #include "convert_json.h" #include "httpfetch.h" #include "util/string.h" diff --git a/src/serverlist.h b/src/serverlist.h index 8ffea44cc..0747c3920 100644 --- a/src/serverlist.h +++ b/src/serverlist.h @@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <iostream> #include "config.h" #include "mods.h" -#include "json/json.h" +#include <json/json.h> #ifndef SERVERLIST_HEADER #define SERVERLIST_HEADER |