From 68d69233579dce9930a060fb4eb6a619bfb969eb Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Mon, 19 Nov 2018 19:55:32 +0200 Subject: [PATCH] SDL: converted Guichan to static library, because we are using static libc++ so all C++ code must be linked inside libapplication.so --- project/jni/SettingsTemplate.mk | 2 +- project/jni/guichan/Android.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/jni/SettingsTemplate.mk b/project/jni/SettingsTemplate.mk index 6976dcffb..5a9f2f167 100644 --- a/project/jni/SettingsTemplate.mk +++ b/project/jni/SettingsTemplate.mk @@ -6,7 +6,7 @@ APP_AVAILABLE_STATIC_LIBS := jpeg png freetype fontconfig xerces ogg vorbis flac boost_regex boost_serialization boost_signals boost_stacktrace_basic boost_stacktrace_noop \ boost_system boost_test_exec_monitor boost_thread boost_timer boost_type_erasure boost_unit_test_framework boost_wave boost_wserialization \ glu icudata icutest icui18n icuio icule iculx icutu icuuc icu-le-hb harfbuzz sdl_savepng android_support \ - gl4es nanogl gd + gl4es nanogl gd guichan # 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 APP_MODULES := application sdl-1.2 sdl_main sdl_native_helpers jpeg png ogg flac vorbis freetype tremor ogg diff --git a/project/jni/guichan/Android.mk b/project/jni/guichan/Android.mk index 691c142b7..3bfd73dfd 100755 --- a/project/jni/guichan/Android.mk +++ b/project/jni/guichan/Android.mk @@ -22,4 +22,4 @@ LOCAL_STATIC_LIBRARIES := LOCAL_LDLIBS := -llog -include $(BUILD_SHARED_LIBRARY) +include $(BUILD_STATIC_LIBRARY)