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

csnover csnover at users.noreply.github.com
Sun Jan 15 05:39:55 CET 2017


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


Commit: ee04b63d96895100ea27ce0f8b174a696b2c0779
    https://github.com/scummvm/scummvm/commit/ee04b63d96895100ea27ce0f8b174a696b2c0779
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-01-14T22:39:28-06:00

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

Android builds currently fail when building the test runner because
the runner tries to include standard library headers, which cannot
be found. This patch adds the gcc-stdlibc++ include directory that
matches the existing gcc-stdlibc++ linker flag.

Changed paths:
    configure


diff --git a/configure b/configure
index b8656b1..9634b3a 100755
--- a/configure
+++ b/configure
@@ -2358,6 +2358,7 @@ 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 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"





More information about the Scummvm-git-logs mailing list