[Scummvm-git-logs] scummvm master -> 742fd9ce2dce394d95a423eca5155db0162364e0

sev- sev at scummvm.org
Fri Sep 16 18:07:55 CEST 2016


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:
bae1f67b65 ANDROIDSDL: Enabled mt32emu
742fd9ce2d Merge pull request #828 from lubomyr/master


Commit: bae1f67b656d7c9f09f983a397665be2220b7824
    https://github.com/scummvm/scummvm/commit/bae1f67b656d7c9f09f983a397665be2220b7824
Author: lubomyr (lubomyr31 at gmail.com)
Date: 2016-09-15T15:26:53+02:00

Commit Message:
ANDROIDSDL: Enabled mt32emu

Changed paths:
    configure
    dists/androidsdl/scummvm/AndroidBuild.sh



diff --git a/configure b/configure
index 8315ba2..34799ef 100755
--- a/configure
+++ b/configure
@@ -2731,7 +2731,6 @@ if test -n "$_host"; then
 			DEFINES="$DEFINES -DANDROIDSDL"
 			_unix=yes
 			_seq_midi=no
-			_mt32emu=no
 			_timidity=no
 			_backend="androidsdl"
 			_port_mk="backends/platform/androidsdl/androidsdl.mk"
diff --git a/dists/androidsdl/scummvm/AndroidBuild.sh b/dists/androidsdl/scummvm/AndroidBuild.sh
index 5cc6863..b5dc538 100644
--- a/dists/androidsdl/scummvm/AndroidBuild.sh
+++ b/dists/androidsdl/scummvm/AndroidBuild.sh
@@ -10,6 +10,6 @@ ln -sf libtheora.so $LOCAL_PATH/../../../obj/local/$1/libtheoradec.so
 ln -sf libglshim.a $LOCAL_PATH/../../../obj/local/$1/libGL.a
 
 if [ \! -f scummvm/config.mk ] ; then
-	../setEnvironment-$1.sh sh -c "cd scummvm && 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-vkeybd --enable-release --disable-readline --disable-nasm --disable-mt32emu --disable-timidity --disable-fluidsynth --datadir=. "
+	../setEnvironment-$1.sh sh -c "cd scummvm && 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-vkeybd --enable-release --enable-mt32emu --disable-readline --disable-nasm --disable-timidity --disable-fluidsynth --datadir=. "
 fi
 ../setEnvironment-$1.sh make -C scummvm -j2 && cp -f scummvm/scummvm libapplication-$1.so


Commit: 742fd9ce2dce394d95a423eca5155db0162364e0
    https://github.com/scummvm/scummvm/commit/742fd9ce2dce394d95a423eca5155db0162364e0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-16T18:07:50+02:00

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

ANDROIDSDL: Enabled mt32emu

Changed paths:
    configure
    dists/androidsdl/scummvm/AndroidBuild.sh








More information about the Scummvm-git-logs mailing list