Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix for failure to find jsoncpp in android build (#4456)
Commit 4503b5 did not update the android build script.
  • Loading branch information
Rogier-5 authored and est31 committed Aug 19, 2016
1 parent 7f4c6f3 commit a496224
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions build/android/jni/Android.mk
Expand Up @@ -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 \
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit a496224

Please sign in to comment.