Fix for failure to find jsoncpp in android build (#4456)
authorRogier-5 <rogier777@gmail.com>
Fri, 19 Aug 2016 18:23:30 +0000 (20:23 +0200)
committerest31 <est31@users.noreply.github.com>
Fri, 19 Aug 2016 18:23:30 +0000 (20:23 +0200)
Commit 4503b5 did not update the android build script.

build/android/jni/Android.mk

index a42ab76b8a70704357786a1b15d99dfe553f3c02..2d850385ea830672b767987e7ac2d19f98a5bc84 100644 (file)
@@ -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)