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

[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:
ecf9c95296 BUILD: Attempt to fix Android builds of test runner


Commit: ecf9c95296fb10bb5fa982f3bc4bfe110c597a9f
    https://github.com/scummvm/scummvm/commit/ecf9c95296fb10bb5fa982f3bc4bfe110c597a9f
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-01-15T10:16:09-06:00

Commit Message:
BUILD: Attempt to fix Android builds of test runner

Mixing -I and -isystem for system headers causes failures.

Changed paths:
    configure


diff --git a/configure b/configure
index 8ddd760..dc05460 100755
--- a/configure
+++ b/configure
@@ -2358,8 +2358,8 @@ case $_host_os in
 			append_var LDFLAGS "-mthumb-interwork"
 		fi
 
-		append_var CXXFLAGS "-isystem $ANDROID_NDK/sources/cxx-stl/gnu-libstdc++/`$CXX -dumpversion`/include/"
-		append_var CXXFLAGS "-isystem $ANDROID_NDK/sources/cxx-stl/gnu-libstdc++/`$CXX -dumpversion`/libs/$ABI/include/"
+		append_var INCLUDES "-isystem $ANDROID_NDK/sources/cxx-stl/gnu-libstdc++/`$CXX -dumpversion`/include/"
+		append_var INCLUDES "-isystem $ANDROID_NDK/sources/cxx-stl/gnu-libstdc++/`$CXX -dumpversion`/libs/$ABI/include/"
 		append_var LDFLAGS "-L$ANDROID_NDK/sources/cxx-stl/gnu-libstdc++/`$CXX -dumpversion`/libs/$ABI/"
 		append_var LIBS "-lsupc++"
 		add_line_to_config_mk "ANDROID_SDK = $ANDROID_SDK"
@@ -3197,7 +3197,7 @@ case $_backend in
 		append_var DEFINES "-DREDUCE_MEMORY_USAGE"
 		append_var CXXFLAGS "-Wa,--noexecstack"
 		append_var LDFLAGS "-Wl,-z,noexecstack"
-		append_var INCLUDES "-I$ANDROID_NDK/sources/cxx-stl/system/include"
+		append_var INCLUDES "-isystem $ANDROID_NDK/sources/cxx-stl/system/include"
 		;;
 	androidsdl)
 		;;