MultiCraftProject/MultiCraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: switch to NDK libiconv

Browse Source
This commit is contained in:
MoNTE48 2020-05-03 22:24:17 +02:00
parent 872f0709e2
commit e9cb883114
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/android/native/build.gradle
View File

@ -52,4 +52,16 @@ task cloneGitRepo() {
}
}
task clonelibiconv() {
def destination = file('deps/Android/ndk_iconv')
if(!destination.exists()) {
def grgit = Grgit.clone(
dir: destination,
uri: 'https://github.com/MoNTE48/ndk_iconv'
)
grgit.close()
}
}
preBuild.dependsOn cloneGitRepo
preBuild.dependsOn clonelibiconv

7
build/android/native/jni/Android.mk
View File

@ -72,8 +72,7 @@ LOCAL_C_INCLUDES := \
deps/Android/Freetype/include \
deps/Android/Irrlicht/include \
deps/Android/LevelDB/include \
deps/Android/libiconv/include \
deps/Android/libiconv/libcharset/include \
deps/Android/ndk_iconv \
deps/Android/LuaJIT/src \
deps/Android/OpenAL-Soft/include \
deps/Android/Vorbis/include
@ -227,9 +226,7 @@ LOCAL_SRC_FILES += ../../../lib/intl/libintl.cpp
# JSONCPP
LOCAL_SRC_FILES += ../../../lib/jsoncpp/jsoncpp.cpp
LOCAL_SRC_FILES += \
deps/Android/libiconv/lib/iconv.c \
deps/Android/libiconv/libcharset/lib/localcharset.c
LOCAL_SRC_FILES += deps/Android/ndk_iconv/iconv.c
LOCAL_STATIC_LIBRARIES += Irrlicht LevelDB Curl Freetype OpenAL Vorbis LuaJIT android_native_app_glue $(PROFILER_LIBS)