diff options
| author | Antoniou Athanasios | 2019-04-28 16:08:37 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2019-04-28 16:08:37 +0300 |
| commit | 793aa4033dafb9f399c362d5befc0389239ea18f (patch) | |
| tree | c677e944ace72650a7af9a4d365908bec9eca7dd /dists/androidsdl/scummvm | |
| parent | b3d5bb34ae52063abb23175de9bd4d6d525145e1 (diff) | |
| download | scummvm-rg350-793aa4033dafb9f399c362d5befc0389239ea18f.tar.gz scummvm-rg350-793aa4033dafb9f399c362d5befc0389239ea18f.tar.bz2 scummvm-rg350-793aa4033dafb9f399c362d5befc0389239ea18f.zip | |
ANDROIDSDL: Fix build with NDK r15c
This also disables cloud support
Also, several corrections and additions in how_to_build instructions
Tested in a clean installation of lubuntu 16.04.6 LTS
Diffstat (limited to 'dists/androidsdl/scummvm')
| -rw-r--r-- | dists/androidsdl/scummvm/AndroidAppSettings.cfg | 3 | ||||
| -rw-r--r-- | dists/androidsdl/scummvm/AndroidAppSettings.cfg.in | 3 | ||||
| -rwxr-xr-x | dists/androidsdl/scummvm/AndroidBuild.sh | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/dists/androidsdl/scummvm/AndroidAppSettings.cfg b/dists/androidsdl/scummvm/AndroidAppSettings.cfg index 34427129ea..292fdae883 100644 --- a/dists/androidsdl/scummvm/AndroidAppSettings.cfg +++ b/dists/androidsdl/scummvm/AndroidAppSettings.cfg @@ -185,7 +185,8 @@ DeleteFilesOnUpgrade="%" # 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="mad vorbis flac ogg jpeg png theora freetype faad curl sdl_net" +#CompiledLibraries="mad vorbis flac ogg jpeg png theora freetype faad curl sdl_net" +CompiledLibraries="mad vorbis flac ogg jpeg png theora freetype faad" # Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n) CustomBuildScript=y diff --git a/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in b/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in index 0b6b6c6827..380aca1db0 100644 --- a/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in +++ b/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in @@ -185,7 +185,8 @@ DeleteFilesOnUpgrade="%" # 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="mad vorbis flac ogg jpeg png theora freetype faad curl sdl_net" +#CompiledLibraries="mad vorbis flac ogg jpeg png theora freetype faad curl sdl_net" +CompiledLibraries="mad vorbis flac ogg jpeg png theora freetype faad" # Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n) CustomBuildScript=y diff --git a/dists/androidsdl/scummvm/AndroidBuild.sh b/dists/androidsdl/scummvm/AndroidBuild.sh index a00e6fd88b..da551a73c1 100755 --- a/dists/androidsdl/scummvm/AndroidBuild.sh +++ b/dists/androidsdl/scummvm/AndroidBuild.sh @@ -14,7 +14,7 @@ ln -sf libglshim.a $ANDROIDSDL/project/obj/local/$1/libGL.a mkdir -p scummvm/bin-$1 if [ \! -f scummvm/bin-$1/config.mk ] ; then - $ANDROIDSDL/project/jni/application/setEnvironment-$1.sh sh -c "cd scummvm/bin-$1 && env LIBS='-lflac -lvorbis -logg -lmad -lz -lgcc -ltheora -lpng -lfreetype -lfaad -lgnustl_static' ../configure --host=androidsdl-$1 --enable-zlib --enable-vorbis --enable-mad --enable-flac --enable-png --enable-theoradec --enable-sdlnet --enable-libcurl --enable-vkeybd --enable-release --enable-mt32emu --disable-readline --disable-nasm --disable-timidity --disable-fluidsynth --datadir=. " + $ANDROIDSDL/project/jni/application/setEnvironment-$1.sh sh -c "cd scummvm/bin-$1 && env LIBS='-lflac -lvorbis -logg -lmad -lz -lgcc -ltheora -lpng -lfreetype -lfaad -lgnustl_static' ../configure --host=androidsdl-$1 --enable-zlib --enable-vorbis --enable-mad --enable-flac --enable-png --enable-theoradec --disable-sdlnet --disable-libcurl --disable-cloud --enable-vkeybd --enable-release --enable-mt32emu --disable-readline --disable-nasm --disable-timidity --disable-fluidsynth --datadir=. " fi $ANDROIDSDL/project/jni/application/setEnvironment-$1.sh make -j4 -C scummvm/bin-$1 make -C scummvm/bin-$1 androidsdl |