From dcad83e05b51a268d805163d1b83feb90198b7f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vincent=20Be=CC=81nony?= <bsr43@hopperapp.com>
Date: Sun, 6 Dec 2015 12:29:06 +0100
Subject: [PATCH] IOS: Fixes compilation under Linux

---
 configure | 13 +++++--------
 ports.mk  |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/configure b/configure
index b3008a13d62..025e577be91 100755
--- a/configure
+++ b/configure
@@ -2056,8 +2056,8 @@ echo_n "Checking host CPU architecture... "
 case $_host_cpu in
 	arm*)
 		case $_host_alias in
-			arm-apple*)
-				echo "Apple iPhone - ARM assembly disabled"
+			arm-apple-darwin11)
+				echo "Apple iOS 7+ - ARM assembly disabled"
 				;;
 			*)
 				echo "ARM"
@@ -2720,9 +2720,6 @@ if test -n "$_host"; then
 			_mt32emu=no
 			_seq_midi=no
 			_timidity=no
-			_ar="ar cru"
-			_ranlib=ranlib
-			_strip=strip
 			;;
 		m68k-atari-mint)
 			append_var DEFINES "-DSYSTEM_NOT_SUPPORTING_D_TYPE"
@@ -3025,9 +3022,9 @@ case $_backend in
 		append_var CFLAGS "-miphoneos-version-min=7.1 -arch armv7"
 		append_var CXXFLAGS "-miphoneos-version-min=7.1 -arch armv7"
 		if test -n "$SDKROOT"; then
-			append_var LDFLAGS "-isysroot $SDKROOT -I $SDKROOT/usr/include"
-			append_var CFLAGS "-isysroot $SDKROOT -I $SDKROOT/usr/include"
-			append_var CXXFLAGS "-isysroot $SDKROOT -I $SDKROOT/usr/include"
+			append_var LDFLAGS "-mlinker-version=134.9 -B/usr/local/bin/arm-apple-darwin11-"
+			append_var CFLAGS "-isysroot $SDKROOT -F$SDKROOT/System/Library/Frameworks"
+			append_var CXXFLAGS "-isysroot $SDKROOT -I$SDKROOT/usr/include/c++/4.2.1 -F$SDKROOT/System/Library/Frameworks"
 		fi
 		;;
 	linuxmoto)
diff --git a/ports.mk b/ports.mk
index fecce3b36bf..3588cfa77a5 100644
--- a/ports.mk
+++ b/ports.mk
@@ -167,7 +167,7 @@ ios7bundle: ios7
 			s=2}\
 		s==0 {print $$0}\
 		s > 0 { s-- }' $(srcdir)/dists/ios7/Info.plist >$(bundle_name)/Info.plist
-	sed -i '' -e 's/$$(PRODUCT_BUNDLE_IDENTIFIER)/org.scummvm.scummvm/' $(bundle_name)/Info.plist
+	sed -i'' -e 's/$$(PRODUCT_BUNDLE_IDENTIFIER)/org.scummvm.scummvm/' $(bundle_name)/Info.plist
 	cp $(DIST_FILES_DOCS) $(bundle_name)/
 	cp $(DIST_FILES_THEMES) $(bundle_name)/
 ifdef DIST_FILES_ENGINEDATA