[Scummvm-git-logs] scummvm master -> 49594579680b98ed48fba19903d96a4fc74a4616

[lephilousophe]

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:
4959457968 IOS7: Add 64-bit target


Commit: 49594579680b98ed48fba19903d96a4fc74a4616
    https://github.com/scummvm/scummvm/commit/49594579680b98ed48fba19903d96a4fc74a4616
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-03-21T17:48:30+01:00

Commit Message:
IOS7: Add 64-bit target

Changed paths:
    configure


diff --git a/configure b/configure
index d0e30fc0ca..b25d54059f 100755
--- a/configure
+++ b/configure
@@ -965,7 +965,7 @@ Usage: $0 [OPTIONS]...
 Configuration:
   -h, --help              display this help and exit
   --backend=BACKEND       backend to build (3ds, android, dc, dingux, ds, gcw0,
-                          gph, iphone, ios7, maemo, n64, null, openpandora,
+                          gph, iphone, ios7, ios7-arm64, maemo, n64, null, openpandora,
                           psp, psp2, samsungtv, sdl, switch, wii) [sdl]
 
 Installation directories:
@@ -1009,6 +1009,7 @@ Special configuration feature:
                                            gp2xwiz for GP2X Wiz
                                            iphone for Apple iPhone (iOS <= 6)
                                            ios7 for Apple iPhone / iPad (iOS >= 7)
+                                           ios7-arm64 for Apple iPhone / iPad (iOS >= 7, 64-bit)
                                            maemo for Nokia Maemo
                                            n64 for Nintendo 64
                                            openpandora for OpenPandora
@@ -1763,6 +1764,12 @@ ios7)
 	_host_cpu=arm
 	_host_alias=arm-apple-darwin11
 	;;
+ios7-arm64)
+	_host_os=iphone
+	# Remaining of configure don't known about arm64
+	_host_cpu=aarch64
+	_host_alias=arm64-apple-darwin11
+	;;
 maemo)
 	_host_os=maemo
 	_host_cpu=arm
@@ -3523,7 +3530,7 @@ if test -n "$_host"; then
 			_seq_midi=no
 			_timidity=no
 			;;
-		ios7)
+		ios7*)
 			add_line_to_config_mk 'IPHONE = 1'
 			append_var DEFINES "-DIPHONE -DIPHONE_IOS7 -DIPHONE_SANDBOXED"
 			_backend="ios7"
@@ -3768,9 +3775,15 @@ case $_backend in
 		append_var LIBS "-lobjc -framework UIKit -framework CoreGraphics -framework OpenGLES"
 		append_var LIBS "-framework QuartzCore -framework CoreFoundation -framework Foundation"
 		append_var LIBS "-framework AudioToolbox -framework CoreAudio -framework SystemConfiguration "
-		append_var LDFLAGS "-miphoneos-version-min=7.1 -arch armv7"
-		append_var CFLAGS "-miphoneos-version-min=7.1 -arch armv7"
-		append_var CXXFLAGS "-miphoneos-version-min=7.1 -arch armv7"
+		if [ $_host_cpu = 'aarch64' ]; then
+			append_var LDFLAGS "-miphoneos-version-min=7.1 -arch arm64"
+			append_var CFLAGS "-miphoneos-version-min=7.1 -arch arm64"
+			append_var CXXFLAGS "-miphoneos-version-min=7.1 -arch arm64"
+		else
+			append_var LDFLAGS "-miphoneos-version-min=7.1 -arch armv7"
+			append_var CFLAGS "-miphoneos-version-min=7.1 -arch armv7"
+			append_var CXXFLAGS "-miphoneos-version-min=7.1 -arch armv7"
+		fi
 		if test -n "$SDKROOT"; then
 			append_var LDFLAGS "-mlinker-version=134.9 -B/usr/local/bin/arm-apple-darwin11-"
 			append_var CFLAGS "-isysroot $SDKROOT -F$SDKROOT/System/Library/Frameworks"