Skip to content
Snippets Groups Projects
Commit a4962240 authored by Rogier's avatar Rogier Committed by est31
Browse files

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

Commit 4503b5 did not update the android build script.
parent 7f4c6f32
No related branches found
No related tags found
No related merge requests found
...@@ -99,7 +99,7 @@ LOCAL_C_INCLUDES := \ ...@@ -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 += \ ...@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment