[Scummvm-git-logs] scummvm master -> 9454c5c63daaca96b97534e91fb7632dc1509d39

[csnover]

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

Summary:
9454c5c63d Revert "ANDROID: Stop disabling MT-32 emulator"


Commit: 9454c5c63daaca96b97534e91fb7632dc1509d39
    https://github.com/scummvm/scummvm/commit/9454c5c63daaca96b97534e91fb7632dc1509d39
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-11-26T10:08:04-06:00

Commit Message:
Revert "ANDROID: Stop disabling MT-32 emulator"

This reverts commit 2a22c16b916602ee9ced429455add5707b0c4f74.

The old Buildbot (or maybe the build code's messing about with
LDFLAGS) seems to be broken and won't link successfully with the
std APIs, so this gets turned back off again until the new Buildbot
is active during the next release cycle.

Changed paths:
    configure


diff --git a/configure b/configure
index dff0e06..a8716ac 100755
--- a/configure
+++ b/configure
@@ -2826,6 +2826,7 @@ if test -n "$_host"; then
 			_port_mk="backends/platform/android/android.mk"
 			_build_scalers=no
 			_seq_midi=no
+			_mt32emu=no
 			_timidity=no
 			;;
 		androidsdl | androidsdl-armeabi | androidsdl-armeabi-v7a | androidsdl-mips | androidsdl-x86 | androidsdl-arm64-v8a | androidsdl-x86_64)