Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for failure to find jsoncpp in android build (#4456) 

Commit 4503b5 did not update the android build script.
This commit is contained in:
Rogier-5 2016-08-19 20:23:30 +02:00 committed by est31
parent 7f4c6f32da
commit a4962240bd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/android/jni/Android.mk
View File

@ -99,7 +99,7 @@ LOCAL_C_INCLUDES := \
jni/src \ jni/src \
jni/src/script \ jni/src/script \
jni/src/lua/src \ jni/src/lua/src \
jni/src/json \ jni/src/jsoncpp \
jni/src/cguittfont \ jni/src/cguittfont \
deps/irrlicht/include \ deps/irrlicht/include \
deps/libiconv/include \ deps/libiconv/include \
@ -361,7 +361,7 @@ LOCAL_SRC_FILES += \
jni/src/threading/thread.cpp jni/src/threading/thread.cpp
# JSONCPP # 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_SHARED_LIBRARIES := iconv openal ogg vorbis gmp
LOCAL_STATIC_LIBRARIES := Irrlicht freetype curl ssl crypto android_native_app_glue $(PROFILER_LIBS) LOCAL_STATIC_LIBRARIES := Irrlicht freetype curl ssl crypto android_native_app_glue $(PROFILER_LIBS)