From f355646fb8db9faef9ff6a98f4503b8dc600b3a1 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 14 Mar 2021 11:50:23 +0100
Subject: [PATCH] Add ios-arm64/tvos-arm64

---
 .gitlab-ci.yml        | 28 +++++++++++++++++++++++++---
 src/libretro/Makefile | 19 ++++++-------------
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a0bb99c9..89a8c21c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,7 +44,11 @@ include:
   - project: 'libretro-infrastructure/ci-templates'
     file: '/android-jni.yml'
 
-  # iOS 9
+  # iOS
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/ios-arm64.yml'
+
+  # iOS (armv7)
   - project: 'libretro-infrastructure/ci-templates'
     file: '/ios9.yml'
 
@@ -57,6 +61,12 @@ include:
   - project: 'libretro-infrastructure/ci-templates'
     file: '/libnx-static.yml'
 
+  # tvOS (AppleTV)
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/tvos-arm64.yml'
+
+  #################################### MISC ##################################
+
 # Stages for building
 stages:
   - build-prepare
@@ -129,11 +139,23 @@ android-x86:
     - .libretro-android-jni-x86
     - .core-defs
 
-# iOS 9
-libretro-build-ios-9:
+# 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 Vita
diff --git a/src/libretro/Makefile b/src/libretro/Makefile
index 5e444e2f..2c35083e 100644
--- a/src/libretro/Makefile
+++ b/src/libretro/Makefile
@@ -170,6 +170,7 @@ else ifneq (,$(findstring ios,$(platform)))
 	TARGET := $(TARGET_NAME)_libretro_ios.dylib
 	fpic := -fPIC
 	SHARED := -dynamiclib
+        MINVERSION :=
 	ifeq ($(IOSSDK),)
 	  IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
 	endif
@@ -181,22 +182,12 @@ else ifneq (,$(findstring ios,$(platform)))
 	  CXX = clang++ -arch armv7 -isysroot $(IOSSDK)
 	endif
 	CFLAGS += -DIOS
-   ifeq ($(platform), ios-arm64)
-     CXX = clang++ -arch armv7 -isysroot $(IOSSDK)
-     CC = clang -arch arm64 -isysroot $(IOSSDK)
-   else
-     CC = clang -arch armv7 -isysroot $(IOSSDK)
-     CXX = clang++ -arch armv7 -isysroot $(IOSSDK)
-   endif   
 	ifeq ($(platform),$(filter $(platform),ios9 ios-arm64))
-	  CC     += -miphoneos-version-min=8.0
-	  CXX    += -miphoneos-version-min=8.0
-	  CFLAGS += -miphoneos-version-min=8.0
+	  MINVERSION = -miphoneos-version-min=8.0
 	else
-	  CC     += -miphoneos-version-min=5.0
-	  CXX    += -miphoneos-version-min=5.0
-	  CFLAGS += -miphoneos-version-min=5.0
+	  MINVERSION = -miphoneos-version-min=5.0
 	endif
+        CFLAGS += $(MINVERSION)
 	TILED_RENDERING=1
 
 else ifeq ($(platform), tvos-arm64)
@@ -207,6 +198,8 @@ ifeq ($(IOSSDK),)
    IOSSDK := $(shell xcodebuild -version -sdk appletvos Path)
 endif
    TILED_RENDERING = 1
+   CC = cc -arch arm64 -isysroot $(IOSSDK)
+   CXX = c++ -arch arm64 -isysroot $(IOSSDK)
 
 # Theos iOS
 else ifeq ($(platform), theos_ios)