diff --git a/.gitmodules b/.gitmodules index 765426f04..96e5f8076 100644 --- a/.gitmodules +++ b/.gitmodules @@ -90,3 +90,6 @@ [submodule "project/jni/sdl2_image"] path = project/jni/sdl2_image url = https://github.com/libsdl-org/SDL_image +[submodule "project/jni/sdl2_ttf"] + path = project/jni/sdl2_ttf + url = https://github.com/libsdl-org/SDL_ttf.git diff --git a/project/jni/SDL2_ttf/include b/project/jni/SDL2_ttf/include new file mode 120000 index 000000000..c173799d9 --- /dev/null +++ b/project/jni/SDL2_ttf/include @@ -0,0 +1 @@ +../sdl2_ttf \ No newline at end of file diff --git a/project/jni/application/supertux/AndroidAppSettings.cfg b/project/jni/application/supertux/AndroidAppSettings.cfg index ddd92a97f..3b6123a7f 100644 --- a/project/jni/application/supertux/AndroidAppSettings.cfg +++ b/project/jni/application/supertux/AndroidAppSettings.cfg @@ -290,7 +290,7 @@ MultiABI='arm64-v8a' # Optional shared libraries to compile - removing some of them will save space # MP3 patents are expired, but libmad license is GPL, not LGPL # 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="c++_shared SDL2_image glm boost_filesystem boost_system boost_date_time boost_locale icuuc icudata iconv charset crypto ssl curl openal vorbis ogg" +CompiledLibraries="c++_shared SDL2_image SDL2_ttf glm boost_filesystem boost_system boost_date_time boost_locale icuuc icudata iconv charset crypto ssl curl openal vorbis ogg" # Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n) CustomBuildScript=n @@ -308,7 +308,7 @@ AppLdflags='-frtti -fexceptions -Oz' AppOverlapsSystemHeaders=n # Build only following subdirs (empty will build all dirs, ignored with custom script) -AppSubdirsBuild='. supertux/src/* supertux/external/findlocale supertux/external/obstack supertux/external/squirrel/include supertux/external/squirrel/squirrel supertux/external/squirrel/sqstdlib supertux/external/tinygettext/include supertux/external/tinygettext/src supertux/external/sexp-cpp/include supertux/external/sexp-cpp/src supertux/external/physfs/src supertux/external/partio_zip supertux/external/SDL_SavePNG supertux/external/SDL_ttf' +AppSubdirsBuild='. supertux/src/* supertux/external/findlocale supertux/external/obstack supertux/external/squirrel/include supertux/external/squirrel/squirrel supertux/external/squirrel/sqstdlib supertux/external/tinygettext/include supertux/external/tinygettext/src supertux/external/sexp-cpp/include supertux/external/sexp-cpp/src supertux/external/physfs/src supertux/external/partio_zip supertux/external/SDL_SavePNG' # Exclude these files from build AppBuildExclude='supertux/external/findlocale/example.c supertux/src/video/sdl supertux/external/SDL_SavePNG/main.c' diff --git a/project/jni/sdl2_ttf b/project/jni/sdl2_ttf new file mode 160000 index 000000000..29e2cce5e --- /dev/null +++ b/project/jni/sdl2_ttf @@ -0,0 +1 @@ +Subproject commit 29e2cce5ebbaa1a705b77219f384c9dac968df4d