aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorThanasis Antoniou2019-11-12 20:01:43 +0200
committerThanasis Antoniou2019-11-12 20:01:43 +0200
commit3e9504856f9b4f07b2befa0845fe500fbdfba9f9 (patch)
treebf9bf01aff8b91c9d88d2173cb6333d288f1ed29 /configure
parentfe296f1c4737ecdb28b96ed98e07ce602ecae699 (diff)
downloadscummvm-rg350-3e9504856f9b4f07b2befa0845fe500fbdfba9f9.tar.gz
scummvm-rg350-3e9504856f9b4f07b2befa0845fe500fbdfba9f9.tar.bz2
scummvm-rg350-3e9504856f9b4f07b2befa0845fe500fbdfba9f9.zip
ANDROID: Override UTF-8 compliant definition of vsn_printf
This sets Android as a non-standard port in configure in order to override the definition for vsn_printf The vsn_printf implementation is taken from https://github.com/weiss/c99-snprintf
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure3
1 files changed, 3 insertions, 0 deletions
diff --git a/configure b/configure
index 98958fc064..20f763bef4 100755
--- a/configure
+++ b/configure
@@ -3075,6 +3075,7 @@ if test -n "$_host"; then
_port_mk="backends/platform/3ds/3ds.mk"
;;
android | android-arm | android-v7a | android-arm-v7a | android-arm64-v8a | android-mips | android-mips64 | android-x86 | android-x86_64 | ouya)
+ # also __ANDROID__ is defined by Clang in the NDK
DEFINES="$DEFINES -D__ANDROID_PLAIN_PORT__ -DANDROID_PLAIN_PORT"
# we link a .so as default
append_var LDFLAGS "-shared"
@@ -3561,6 +3562,8 @@ case $_backend in
;;
android)
append_var DEFINES "-DREDUCE_MEMORY_USAGE"
+ append_var DEFINES "-DNONSTANDARD_PORT"
+ append_var INCLUDES '-I$(srcdir)/backends/platform/android'
append_var CXXFLAGS "-Wa,--noexecstack"
append_var LDFLAGS "-Wl,-z,noexecstack"
# removed the following directive - was causing compilation issues when not also explicitly using --disable-mt32emu