thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ANDROID: Add support for building arm64 binaries

Browse source
This commit is contained in:
Bastien Bouclet 2019-05-08 20:10:14 +02:00
parent 1267b72c38
commit 32b0c2cf2c
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
configure vendored
View file

@ -1484,6 +1484,11 @@ android | android-arm | android-v7a | android-arm-v7a | ouya)
_host_cpu=arm _host_cpu=arm
_host_alias=arm-linux-androideabi _host_alias=arm-linux-androideabi
;; ;;
android-arm64-v8a)
_host_os=android
_host_cpu=aarch64
_host_alias=aarch64-linux-android
;;
android-mips) android-mips)
_host_os=android _host_os=android
_host_cpu=mipsel _host_cpu=mipsel
@ -2498,8 +2503,6 @@ case $_host_os in
append_var CXXFLAGS "-mfloat-abi=softfp" append_var CXXFLAGS "-mfloat-abi=softfp"
append_var LDFLAGS "-mthumb" append_var LDFLAGS "-mthumb"
ABI="armeabi" ABI="armeabi"
ANDROID_PLATFORM=9
ANDROID_PLATFORM_ARCH="arm"
;; ;;
android-v7a | android-arm-v7a) android-v7a | android-arm-v7a)
append_var CXXFLAGS "-march=armv7-a" append_var CXXFLAGS "-march=armv7-a"
@ -2507,24 +2510,21 @@ case $_host_os in
append_var CXXFLAGS "-mfpu=vfp" append_var CXXFLAGS "-mfpu=vfp"
append_var LDFLAGS "-Wl,--fix-cortex-a8" append_var LDFLAGS "-Wl,--fix-cortex-a8"
ABI="armeabi-v7a" ABI="armeabi-v7a"
ANDROID_PLATFORM=9 ;;
ANDROID_PLATFORM_ARCH="arm" android-arm64-v8a)
ABI="arm64-v8a"
;; ;;
android-mips) android-mips)
append_var CXXFLAGS "-march=mips32" append_var CXXFLAGS "-march=mips32"
append_var CXXFLAGS "-mtune=mips32" append_var CXXFLAGS "-mtune=mips32"
ABI="mips" ABI="mips"
# Platform version 9 is needed as earlier versions of platform do not support this arch. # Platform version 9 is needed as earlier versions of platform do not support this arch.
ANDROID_PLATFORM=9
ANDROID_PLATFORM_ARCH="mips"
;; ;;
android-x86) android-x86)
append_var CXXFLAGS "-march=i686" append_var CXXFLAGS "-march=i686"
append_var CXXFLAGS "-mtune=i686" append_var CXXFLAGS "-mtune=i686"
ABI="x86" ABI="x86"
# Platform version 9 is needed as earlier versions of platform do not support this arch. # Platform version 9 is needed as earlier versions of platform do not support this arch.
ANDROID_PLATFORM=9
ANDROID_PLATFORM_ARCH="x86"
;; ;;
ouya) ouya)
append_var CXXFLAGS "-march=armv7-a" append_var CXXFLAGS "-march=armv7-a"
@ -2532,8 +2532,6 @@ case $_host_os in
append_var CXXFLAGS "-mfloat-abi=softfp" append_var CXXFLAGS "-mfloat-abi=softfp"
append_var CXXFLAGS "-mfpu=neon" append_var CXXFLAGS "-mfpu=neon"
ABI="armeabi-v7a" ABI="armeabi-v7a"
ANDROID_PLATFORM=16
ANDROID_PLATFORM_ARCH="arm"
;; ;;
esac esac
@ -2964,7 +2962,7 @@ if test -n "$_host"; then
_vorbis=no _vorbis=no
_port_mk="backends/platform/3ds/3ds.mk" _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 # we link a .so as default
append_var LDFLAGS "-shared" append_var LDFLAGS "-shared"
append_var LDFLAGS "-Wl,-Bsymbolic,--no-undefined" append_var LDFLAGS "-Wl,-Bsymbolic,--no-undefined"