aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorBastien Bouclet2019-05-08 20:10:14 +0200
committerBastien Bouclet2019-05-11 20:35:31 +0200
commit32b0c2cf2cf1d230912d44322ddba919be5a7e12 (patch)
treecdaff8e4125cd6af7c6fe2c58e235320460635ca /configure
parent1267b72c3820a4fecd182c617b9722e1067d8398 (diff)
downloadscummvm-rg350-32b0c2cf2cf1d230912d44322ddba919be5a7e12.tar.gz
scummvm-rg350-32b0c2cf2cf1d230912d44322ddba919be5a7e12.tar.bz2
scummvm-rg350-32b0c2cf2cf1d230912d44322ddba919be5a7e12.zip
ANDROID: Add support for building arm64 binaries
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure20
1 files changed, 9 insertions, 11 deletions
diff --git a/configure b/configure
index d06ab40fe3..df69f49fb4 100755
--- a/configure
+++ b/configure
@@ -1484,6 +1484,11 @@ android | android-arm | android-v7a | android-arm-v7a | ouya)
_host_cpu=arm
_host_alias=arm-linux-androideabi
;;
+android-arm64-v8a)
+ _host_os=android
+ _host_cpu=aarch64
+ _host_alias=aarch64-linux-android
+ ;;
android-mips)
_host_os=android
_host_cpu=mipsel
@@ -2498,8 +2503,6 @@ case $_host_os in
append_var CXXFLAGS "-mfloat-abi=softfp"
append_var LDFLAGS "-mthumb"
ABI="armeabi"
- ANDROID_PLATFORM=9
- ANDROID_PLATFORM_ARCH="arm"
;;
android-v7a | android-arm-v7a)
append_var CXXFLAGS "-march=armv7-a"
@@ -2507,24 +2510,21 @@ case $_host_os in
append_var CXXFLAGS "-mfpu=vfp"
append_var LDFLAGS "-Wl,--fix-cortex-a8"
ABI="armeabi-v7a"
- ANDROID_PLATFORM=9
- ANDROID_PLATFORM_ARCH="arm"
+ ;;
+ android-arm64-v8a)
+ ABI="arm64-v8a"
;;
android-mips)
append_var CXXFLAGS "-march=mips32"
append_var CXXFLAGS "-mtune=mips32"
ABI="mips"
# Platform version 9 is needed as earlier versions of platform do not support this arch.
- ANDROID_PLATFORM=9
- ANDROID_PLATFORM_ARCH="mips"
;;
android-x86)
append_var CXXFLAGS "-march=i686"
append_var CXXFLAGS "-mtune=i686"
ABI="x86"
# Platform version 9 is needed as earlier versions of platform do not support this arch.
- ANDROID_PLATFORM=9
- ANDROID_PLATFORM_ARCH="x86"
;;
ouya)
append_var CXXFLAGS "-march=armv7-a"
@@ -2532,8 +2532,6 @@ case $_host_os in
append_var CXXFLAGS "-mfloat-abi=softfp"
append_var CXXFLAGS "-mfpu=neon"
ABI="armeabi-v7a"
- ANDROID_PLATFORM=16
- ANDROID_PLATFORM_ARCH="arm"
;;
esac
@@ -2964,7 +2962,7 @@ if test -n "$_host"; then
_vorbis=no
_port_mk="backends/platform/3ds/3ds.mk"
;;
- android | android-arm | android-v7a | android-arm-v7a | android-mips | android-x86 | ouya)
+ android | android-arm | android-v7a | android-arm-v7a | android-arm64-v8a | android-mips | android-x86 | ouya)
# we link a .so as default
append_var LDFLAGS "-shared"
append_var LDFLAGS "-Wl,-Bsymbolic,--no-undefined"