From 25a09c8776cc6088a5b2bf13dc84eb386c26bb7e Mon Sep 17 00:00:00 2001
From: jan Iversen <jani@libreoffice.org>
Date: Wed, 7 Jun 2017 12:23:17 +0200
Subject: iOS, add support for arm64

Added general support for arm64
Removed experimental/prototype from normal build

Change-Id: I832256c72fbd408084bc802440343c874e7e6d28
---
 config.sub                                                 |  4 ++--
 ios/Module_ios.mk                                          |  1 -
 .../LibreOfficeLight.xcodeproj/project.pbxproj             | 14 ++++++++++++--
 .../Prototype/Prototype.xcodeproj/project.pbxproj          |  4 ++--
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/config.sub b/config.sub
index d654d03cdcd2..27653f4dae8d 100644
--- a/config.sub
+++ b/config.sub
@@ -253,7 +253,7 @@ case $basic_machine in
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arceb \
-	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
 	| avr | avr32 \
 	| be32 | be64 \
 	| bfin \
@@ -369,7 +369,7 @@ case $basic_machine in
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
 	| avr-* | avr32-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
diff --git a/ios/Module_ios.mk b/ios/Module_ios.mk
index 43839a24cf44..8213054e8717 100644
--- a/ios/Module_ios.mk
+++ b/ios/Module_ios.mk
@@ -12,7 +12,6 @@ ifeq ($(OS),IOS)
 
 $(eval $(call gb_Module_add_targets,ios,\
 	CustomTarget_Lo_Xcconfig \
-	CustomTarget_Prototype_app \
 	CustomTarget_LibreOfficeLight_app \
 ))
 
diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 5fd944e6ce64..3fa67664894c 100644
--- a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 48;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -300,7 +300,7 @@
 				};
 			};
 			buildConfigurationList = 397E08F51E597BD8001374E0 /* Build configuration list for PBXProject "LibreOfficeLight" */;
-			compatibilityVersion = "Xcode 3.2";
+			compatibilityVersion = "Xcode 8.0";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -596,6 +596,16 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "LibreOfficeLight/LibreOfficeLight-Prefix.pch";
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				"HEADER_SEARCH_PATHS[arch=*]" = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					"$(LO_BUILDDIR)/config_host",
+					"$(LO_SRCDIR)/include",
+					"$(LO_WORKDIR)/UnoApiHeadersTarget/udkapi/comprehensive",
+					"$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",
+					"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
+					"$(LO_WORKDIR)/ios/generated",
+				);
 				INFOPLIST_FILE = LibreOfficeLight/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
diff --git a/ios/experimental/Prototype/Prototype.xcodeproj/project.pbxproj b/ios/experimental/Prototype/Prototype.xcodeproj/project.pbxproj
index de64d4b9c8aa..4f8816ae3035 100644
--- a/ios/experimental/Prototype/Prototype.xcodeproj/project.pbxproj
+++ b/ios/experimental/Prototype/Prototype.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 48;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -2175,7 +2175,7 @@
 				LastUpgradeCheck = 0500;
 			};
 			buildConfigurationList = BE82BD6D18218E2E00A447B5 /* Build configuration list for PBXProject "Prototype" */;
-			compatibilityVersion = "Xcode 3.2";
+			compatibilityVersion = "Xcode 8.0";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
-- 
cgit