diff options
author | Eugene Sandulenko | 2017-03-11 10:06:34 +0100 |
---|---|---|
committer | GitHub | 2017-03-11 10:06:34 +0100 |
commit | 791229d4329fd748c0422e728a2a655393052265 (patch) | |
tree | 4eeb2c97dcddd8bcb9d605b28c677754e5b27fd1 | |
parent | f5a20ab45410b32b51647ec22151d4b0fe632e60 (diff) | |
parent | a18eb77d5cf6e7bb41b3a6c566cb7de9e99c7860 (diff) | |
download | scummvm-rg350-791229d4329fd748c0422e728a2a655393052265.tar.gz scummvm-rg350-791229d4329fd748c0422e728a2a655393052265.tar.bz2 scummvm-rg350-791229d4329fd748c0422e728a2a655393052265.zip |
Merge pull request #916 from lubomyr/master
ANDROIDSDL: libcurl and sdl_net is enabled by default
-rw-r--r-- | dists/androidsdl/scummvm/AndroidAppSettings.cfg | 2 | ||||
-rw-r--r-- | dists/androidsdl/scummvm/AndroidAppSettings.cfg.in | 2 | ||||
-rwxr-xr-x | dists/androidsdl/scummvm/AndroidBuild.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/dists/androidsdl/scummvm/AndroidAppSettings.cfg b/dists/androidsdl/scummvm/AndroidAppSettings.cfg index 55300e6edd..d636201863 100644 --- a/dists/androidsdl/scummvm/AndroidAppSettings.cfg +++ b/dists/androidsdl/scummvm/AndroidAppSettings.cfg @@ -185,7 +185,7 @@ 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" +CompiledLibraries="mad vorbis flac ogg jpeg png theora freetype faad curl sdl_net" # 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 897389a36f..7837a9e196 100644 --- a/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in +++ b/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in @@ -185,7 +185,7 @@ 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" +CompiledLibraries="mad vorbis flac ogg jpeg png theora freetype faad curl sdl_net" # 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 beeb7a3845..a0f587de1f 100755 --- a/dists/androidsdl/scummvm/AndroidBuild.sh +++ b/dists/androidsdl/scummvm/AndroidBuild.sh @@ -13,6 +13,6 @@ ln -sf libglshim.a $LOCAL_PATH/../../../obj/local/$1/libGL.a mkdir -p scummvm/bin-$1 if [ \! -f scummvm/bin-$1/config.mk ] ; then - ../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 --enable-vkeybd --enable-release --enable-mt32emu --disable-readline --disable-nasm --disable-timidity --disable-fluidsynth --datadir=. " + ../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=. " fi ../setEnvironment-$1.sh make -C scummvm/bin-$1 && cp -f scummvm/bin-$1/scummvm libapplication-$1.so |