[Scummvm-git-logs] scummvm master -> 75894a871c8f2f2e9d7bde7b2e830c4451d34f4c

[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:
75894a871c BUILD: Attempt to fix Android builds when building the test runner


Commit: 75894a871c8f2f2e9d7bde7b2e830c4451d34f4c
    https://github.com/scummvm/scummvm/commit/75894a871c8f2f2e9d7bde7b2e830c4451d34f4c
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-01-14T22:53:29-06:00

Commit Message:
BUILD: Attempt to fix Android builds when building the test runner

This patch adds the additional architecture-dependent gcc-stdlibc++
include directory to match the existing gcc-stdlibc++ linker and
generic include directory.

Changed paths:
    configure


diff --git a/configure b/configure
index 9634b3a..8ddd760 100755
--- a/configure
+++ b/configure
@@ -2359,6 +2359,7 @@ case $_host_os in
 		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 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"