[Scummvm-git-logs] scummvm master -> 791229d4329fd748c0422e728a2a655393052265

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a18eb77d5c ANDROIDSDL: libcurl and sdl_net is enabled by default
791229d432 Merge pull request #916 from lubomyr/master


Commit: a18eb77d5cf6e7bb41b3a6c566cb7de9e99c7860
    https://github.com/scummvm/scummvm/commit/a18eb77d5cf6e7bb41b3a6c566cb7de9e99c7860
Author: lubomyr (lubomyr31 at gmail.com)
Date: 2017-03-05T14:03:43+02:00

Commit Message:
ANDROIDSDL: libcurl and sdl_net is enabled by default

Changed paths:
    dists/androidsdl/scummvm/AndroidAppSettings.cfg
    dists/androidsdl/scummvm/AndroidAppSettings.cfg.in
    dists/androidsdl/scummvm/AndroidBuild.sh


diff --git a/dists/androidsdl/scummvm/AndroidAppSettings.cfg b/dists/androidsdl/scummvm/AndroidAppSettings.cfg
index 55300e6..d636201 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 897389a..7837a9e 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 beeb7a3..a0f587d 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


Commit: 791229d4329fd748c0422e728a2a655393052265
    https://github.com/scummvm/scummvm/commit/791229d4329fd748c0422e728a2a655393052265
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-03-11T10:06:34+01:00

Commit Message:
Merge pull request #916 from lubomyr/master

ANDROIDSDL: libcurl and sdl_net is enabled by default

Changed paths:
    dists/androidsdl/scummvm/AndroidAppSettings.cfg
    dists/androidsdl/scummvm/AndroidAppSettings.cfg.in
    dists/androidsdl/scummvm/AndroidBuild.sh