From 4be95b0d362b97a7896a9757c84aadbb2ad16464 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Thu, 11 Oct 2018 18:25:51 +0300 Subject: [PATCH] SDL: updated submodules --- .gitmodules | 4 +++- project/jni/application/ballfield/AndroidAppSettings.cfg | 2 +- project/jni/iconv/src | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7e061520d..8799c689e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,7 +4,7 @@ [submodule "project/jni/boost/src"] path = project/jni/boost/src url = https://github.com/pelya/Boost-for-Android.git - branch = master2 + branch = master update = merge [submodule "project/jni/application/commandergenius/commandergenius"] path = project/jni/application/commandergenius/commandergenius @@ -36,6 +36,8 @@ [submodule "project/jni/iconv/src"] path = project/jni/iconv/src url = https://github.com/pelya/libiconv-libicu-android.git + branch = master + update = merge [submodule "project/jni/application/openttd/src"] path = project/jni/application/openttd/src url = https://github.com/pelya/openttd-android.git diff --git a/project/jni/application/ballfield/AndroidAppSettings.cfg b/project/jni/application/ballfield/AndroidAppSettings.cfg index 7e7cdb93b..0c1dc08ec 100644 --- a/project/jni/application/ballfield/AndroidAppSettings.cfg +++ b/project/jni/application/ballfield/AndroidAppSettings.cfg @@ -274,7 +274,7 @@ MultiABI='armeabi-v7a arm64-v8a x86 x86_64' # Optional shared libraries to compile - removing some of them will save space # MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed # Available libraries: mad (GPL-ed!) sdl_mixer sdl_image sdl_ttf sdl_net sdl_blitpool sdl_gfx sdl_sound intl xml2 lua jpeg png ogg flac tremor vorbis freetype xerces curl theora fluidsynth lzma lzo2 mikmod openal timidity zzip bzip2 yaml-cpp python boost_date_time boost_filesystem boost_iostreams boost_program_options boost_regex boost_signals boost_system boost_thread glu avcodec avdevice avfilter avformat avresample avutil swscale swresample bzip2 -CompiledLibraries="sdl_image boost_filesystem boost_system crypto ssl curl openal vorbis ogg" +CompiledLibraries="sdl_image icui18n iculx icu-le-hb harfbuzz icudata icuuc iconv charset" # Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n) CustomBuildScript=n diff --git a/project/jni/iconv/src b/project/jni/iconv/src index e0f5a0764..77c9e6c31 160000 --- a/project/jni/iconv/src +++ b/project/jni/iconv/src @@ -1 +1 @@ -Subproject commit e0f5a07645a3d5ec3881fd2f8b822a071e9a2475 +Subproject commit 77c9e6c31e2dc1c5273dfc4b09903957caaf53ca