[Scummvm-git-logs] scummvm master -> f1b0ec772c52a6ab0ac6ef6c27b650eb28a94d48

[antoniou79]

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:
f1b0ec772c CONFIGURE: Remove include path cxx-stl for android (host_os)  builds


Commit: f1b0ec772c52a6ab0ac6ef6c27b650eb28a94d48
    https://github.com/scummvm/scummvm/commit/f1b0ec772c52a6ab0ac6ef6c27b650eb28a94d48
Author: Thanasis Antoniou (antoniou79 at lists.scummvm.org)
Date: 2019-10-25T10:54:32+02:00

Commit Message:
CONFIGURE: Remove include path cxx-stl for android (host_os)  builds

Changed paths:
    configure


diff --git a/configure b/configure
index 41625d5..0277e20 100755
--- a/configure
+++ b/configure
@@ -3556,7 +3556,8 @@ case $_backend in
 		append_var DEFINES "-DREDUCE_MEMORY_USAGE"
 		append_var CXXFLAGS "-Wa,--noexecstack"
 		append_var LDFLAGS "-Wl,-z,noexecstack"
-		append_var INCLUDES "-isystem $ANDROID_NDK/sources/cxx-stl/system/include"
+		# removed the following directive - was causing compilation issues when not also explicitly using --disable-mt32emu
+#		append_var INCLUDES "-isystem $ANDROID_NDK/sources/cxx-stl/system/include"
 		;;
 	androidsdl)
 		_sdl=auto