Skip to content

Commit a496224

Browse files
Rogier-5est31
authored andcommittedAug 19, 2016
Fix for failure to find jsoncpp in android build (#4456)
Commit 4503b5 did not update the android build script.
1 parent 7f4c6f3 commit a496224

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed
 

‎build/android/jni/Android.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ LOCAL_C_INCLUDES := \
9999
jni/src \
100100
jni/src/script \
101101
jni/src/lua/src \
102-
jni/src/json \
102+
jni/src/jsoncpp \
103103
jni/src/cguittfont \
104104
deps/irrlicht/include \
105105
deps/libiconv/include \
@@ -361,7 +361,7 @@ LOCAL_SRC_FILES += \
361361
jni/src/threading/thread.cpp
362362

363363
# JSONCPP
364-
LOCAL_SRC_FILES += jni/src/json/jsoncpp.cpp
364+
LOCAL_SRC_FILES += jni/src/jsoncpp/json/jsoncpp.cpp
365365

366366
LOCAL_SHARED_LIBRARIES := iconv openal ogg vorbis gmp
367367
LOCAL_STATIC_LIBRARIES := Irrlicht freetype curl ssl crypto android_native_app_glue $(PROFILER_LIBS)

0 commit comments

Comments
 (0)