jsoncpp as submodule

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "src/msgpack-c"]
 	path = src/msgpack-c
 	url = https://github.com/msgpack/msgpack-c.git
+[submodule "src/jsoncpp"]
+	path = src/jsoncpp
+	url = https://github.com/open-source-parsers/jsoncpp.git

build/android/Makefile

@@ -999,7 +999,8 @@ locale:
 #==== end of freeminer libs
 
 
-apk: $(PATHCFGFILE) assets $(ICONV_LIB) $(IRRLICHT_LIB) $(CURL_LIB) $(GMP_LIB) $(LEVELDB_TARGET)       \
+# $(ICONV_LIB)
+apk: $(PATHCFGFILE) assets $(IRRLICHT_LIB) $(CURL_LIB) $(GMP_LIB) $(LEVELDB_TARGET)       \
 	$(OPENAL_LIB) $(OGG_LIB) prep_srcdir $(ROOT)/jni/src/android_version.h     \
 	$(MSGPACK_TARGET) $(GETTEXT_LIB) $(LUAJIT_TARGET) \
 	sqlite3_download

build/android/jni/Android.mk

@@ -71,6 +71,24 @@ LOCAL_SRC_FILES := deps/luajit/src/libluajit.a
 include $(PREBUILT_STATIC_LIBRARY)
 endif
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := enet
+LOCAL_C_INCLUDES := jni/src/enet/include
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/jni/src/enet/*.c)
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := jsoncpp
+LOCAL_C_INCLUDES := jni/src/jsoncpp/include
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/jni/src/jsoncpp/src/lib_json/*.cpp)
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := gettext
+LOCAL_C_INCLUDES := deps/gettext
+LOCAL_SRC_FILES := $(wildcard deps/gettext/internal/*.cpp)
+include $(BUILD_STATIC_LIBRARY)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := freeminer
 
@@ -122,7 +140,7 @@ LOCAL_C_INCLUDES :=                               \
 		deps/gettext                              \
 		jni/src jni/src/sqlite                    \
 		jni/src/script                            \
-		jni/src/json                              \
+		jni/src/jsoncpp/include                   \
 		jni/src/cguittfont                        \
 		deps/irrlicht/include                     \
 		deps/libiconv/include                     \
@@ -140,8 +158,7 @@ else
 LOCAL_C_INCLUDES += jni/src/lua/src
 endif
 
-
-LOCAL_SRC_FILES :=                                \
+LOCAL_SRC_FILES +=                                \
 		jni/src/gsmapper.cpp                      \
 		jni/src/guiTextInputMenu.cpp              \
 		jni/src/FMColoredString.cpp               \
@@ -397,17 +414,12 @@ LOCAL_SRC_FILES +=                                \
 		jni/src/jthread/pthread/jevent.cpp        \
 		jni/src/jthread/pthread/jsemaphore.cpp
 
-# json
-LOCAL_SRC_FILES += jni/src/json/jsoncpp.cpp
-
 LOCAL_SHARED_LIBRARIES := openal ogg vorbis gmp
 LOCAL_STATIC_LIBRARIES := Irrlicht iconv freetype curl ssl crypto android_native_app_glue $(PROFILER_LIBS)
 
-LOCAL_SRC_FILES += $(wildcard $(LOCAL_PATH)/jni/src/enet/*.c)
+#freeminer:
+LOCAL_STATIC_LIBRARIES += msgpack enet jsoncpp gettext
 
-LOCAL_SRC_FILES += deps/gettext/internal/libintl.cpp
-
-LOCAL_STATIC_LIBRARIES += msgpack
 ifeq ($(USE_LUAJIT), 1)
 LOCAL_STATIC_LIBRARIES += luajit
 endif

cmake/Modules/FindJson.cmake

@@ -20,8 +20,11 @@ endif()
 
 if(NOT JSONCPP_FOUND)
 	message(STATUS "Using bundled JSONCPP library.")
-	set(JSON_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/json)
-	set(JSON_LIBRARY jsoncpp)
-	add_subdirectory(json)
+	#add_subdirectory(jsoncpp)
+	set(JSON_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/jsoncpp/include)
+	#set(JSON_LIBRARY jsoncpp/src/lib_json/libjsoncpp.a)
+	#set(JSON_LIBRARY jsoncpp)
+	set(JSON_LIBRARY ${jsoncpp_BINARY_DIR}/src/lib_json/libjsoncpp.a)
+	add_subdirectory(jsoncpp)
 endif()
 

src/json/CMakeLists.txt

@@ -1,8 +0,0 @@
-if(MSVC)
-	set(CMAKE_CXX_FLAGS_RELEASE "/MT /O2 /Ob2 /D NDEBUG")
-endif()
-
-include_directories(${PROJECT_SOURCE_DIR})
-add_library(jsoncpp jsoncpp.cpp)
-target_link_libraries(jsoncpp)
-

src/json/UPDATING

@@ -1,11 +0,0 @@
-#!/bin/sh
-cd ..
-git clone --recursive https://github.com/open-source-parsers/jsoncpp.git jsoncpp
-cd jsoncpp
-git pull
-python amalgamate.py
-cp -R dist/json ..
-cp dist/jsoncpp.cpp ../json
-
-#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

src/jsoncpp

@@ -0,0 +1 @@
+Subproject commit 3f05b1a89708381c6f42b3f62cb4203557cb7f35