aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2016-09-16 18:07:50 +0200
committerGitHub2016-09-16 18:07:50 +0200
commit742fd9ce2dce394d95a423eca5155db0162364e0 (patch)
tree79416a49eef37b2859b55c7608b377af14ef891b
parent866f7cbf62b2946b589ee2e441172e3c31454b71 (diff)
parentbae1f67b656d7c9f09f983a397665be2220b7824 (diff)
downloadscummvm-rg350-742fd9ce2dce394d95a423eca5155db0162364e0.tar.gz
scummvm-rg350-742fd9ce2dce394d95a423eca5155db0162364e0.tar.bz2
scummvm-rg350-742fd9ce2dce394d95a423eca5155db0162364e0.zip
Merge pull request #828 from lubomyr/master
ANDROIDSDL: Enabled mt32emu
-rwxr-xr-xconfigure1
-rw-r--r--dists/androidsdl/scummvm/AndroidBuild.sh2
2 files changed, 1 insertions, 2 deletions
diff --git a/configure b/configure
index 8315ba27b3..34799ef266 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 5cc6863f5e..b5dc538b9e 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