From e3fe05b64612b0d1b0376339297174aadd510e00 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 12 Mar 2021 13:14:39 +0100
Subject: [PATCH] Add ios-arm64 and tvos-arm64

---
 .gitlab-ci.yml | 32 ++++++++++++++++++++++++++++++++
 Makefile       | 18 ++++++++++--------
 2 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4243ca8..392173f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,6 +42,14 @@ include:
   - project: 'libretro-infrastructure/ci-templates'
     file: '/android-jni.yml'
 
+  # iOS
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/ios-arm64.yml'
+
+  # iOS (armv7)
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/ios9.yml'
+
   ################################## CONSOLES ################################
   # Nintendo 3DS
   - project: 'libretro-infrastructure/ci-templates'
@@ -75,6 +83,12 @@ include:
   - project: 'libretro-infrastructure/ci-templates'
     file: '/vita-static.yml'
 
+  # tvOS (AppleTV)
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/tvos-arm64.yml'
+
+  #################################### MISC ##################################
+
 # Stages for building
 stages:
   - build-prepare
@@ -143,6 +157,24 @@ android-x86:
     - .libretro-android-jni-x86
     - .core-defs
 
+# iOS
+libretro-build-ios-arm64:
+  extends:
+    - .libretro-ios-arm64-make-default
+    - .core-defs
+
+# iOS (armv7) [iOS 9 and up]
+libretro-build-ios9:
+  extends:
+    - .libretro-ios9-make-default
+    - .core-defs
+    
+# tvOS
+libretro-build-tvos-arm64:
+  extends:
+    - .libretro-tvos-arm64-make-default
+    - .core-defs
+
 ################################### CONSOLES #################################
 # PlayStation 2
 libretro-build-ps2:
diff --git a/Makefile b/Makefile
index 7ec236e..e7175cf 100644
--- a/Makefile
+++ b/Makefile
@@ -104,6 +104,7 @@ else ifneq (,$(findstring ios,$(platform)))
 	TARGET := $(TARGET_NAME)_libretro_ios.dylib
 	fpic := -fPIC
 	SHARED := -dynamiclib
+        MINVERSION :=
 	CFLAGS += -Wno-error=implicit-function-declaration -DHAVE_POSIX_MEMALIGN
 
 	ifeq ($(IOSSDK),)
@@ -123,16 +124,11 @@ endif
 	CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
 
 ifeq ($(platform),$(filter $(platform),ios9 ios-arm64))
-	CC += -miphoneos-version-min=8.0
-	CXX += -miphoneos-version-min=8.0
-	CC_AS += -miphoneos-version-min=8.0
-	PLATFORM_DEFINES := -miphoneos-version-min=8.0 -DIOS
+        MINVERSION = -miphoneos-version-min=8.0
 else
-	CC += -miphoneos-version-min=5.0
-	CXX += -miphoneos-version-min=5.0
-	CC_AS += -miphoneos-version-min=5.0
-	PLATFORM_DEFINES := -miphoneos-version-min=5.0 -DIOS
+        MINVERSION = -miphoneos-version-min=5.0
 endif
+	PLATFORM_DEFINES := $(MINVERSION) -DIOS
 
 # tvOS
 else ifeq ($(platform), tvos-arm64)
@@ -146,6 +142,12 @@ else ifeq ($(platform), tvos-arm64)
 		IOSSDK := $(shell xcodebuild -version -sdk appletvos Path)
 	endif
 
+	CC = cc -arch arm64 -isysroot $(IOSSDK)
+	CC_AS = cc -arch arm64 -isysroot $(IOSSDK)
+	CXX = c++ -arch arm64 -isysroot $(IOSSDK)
+
+	CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
+
 # Theos
 else ifeq ($(platform), theos_ios)
 	DEPLOYMENT_IOSVERSION = 5.0