From: Rogier-5 Date: Fri, 19 Aug 2016 18:23:30 +0000 (+0200) Subject: Fix for failure to find jsoncpp in android build (#4456) X-Git-Tag: 0.4.15~274 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a4962240bdf7ddc221c477ada1c2a99c1aee3e2e;p=oweals%2Fminetest.git Fix for failure to find jsoncpp in android build (#4456) Commit 4503b5 did not update the android build script. --- diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index a42ab76b8..2d850385e 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -99,7 +99,7 @@ LOCAL_C_INCLUDES := \ jni/src \ jni/src/script \ jni/src/lua/src \ - jni/src/json \ + jni/src/jsoncpp \ jni/src/cguittfont \ deps/irrlicht/include \ deps/libiconv/include \ @@ -361,7 +361,7 @@ LOCAL_SRC_FILES += \ jni/src/threading/thread.cpp # JSONCPP -LOCAL_SRC_FILES += jni/src/json/jsoncpp.cpp +LOCAL_SRC_FILES += jni/src/jsoncpp/json/jsoncpp.cpp LOCAL_SHARED_LIBRARIES := iconv openal ogg vorbis gmp LOCAL_STATIC_LIBRARIES := Irrlicht freetype curl ssl crypto android_native_app_glue $(PROFILER_LIBS)