Add ios-arm64/tvos-arm64

.gitlab-ci.yml

@@ -54,7 +54,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'
 
@@ -83,6 +87,10 @@ include:
   - project: 'libretro-infrastructure/ci-templates'
     file: '/wiiu-static.yml'
 
+  # tvOS (AppleTV)
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/tvos-arm64.yml'
+
   #################################### MISC ##################################
   # Emscripten
   - project: 'libretro-infrastructure/ci-templates'
@@ -178,11 +186,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

Makefile

@@ -47,12 +47,14 @@ 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
 
    ifeq ($(platform),ios-arm64)
-		CC = cc -arch arm64 -isysroot $(IOSSDK)
+	CC = cc -arch arm64 -isysroot $(IOSSDK)
    	CXX = c++ -arch arm64 -isysroot $(IOSSDK)   
    else
    	CC = cc -arch armv7 -isysroot $(IOSSDK)
@@ -62,14 +64,12 @@ else ifneq (,$(findstring ios,$(platform)))
    ASM_CPU = 0
    ASM_SPC700 = 0
    ifeq ($(platform),$(filter $(platform),ios9 ios-arm64))
-      CC += -miphoneos-version-min=8.0
-      CXX += -miphoneos-version-min=8.0
-      PLATFORM_DEFINES := -miphoneos-version-min=8.0
+      MINVERSION += -miphoneos-version-min=8.0
    else
-      CC += -miphoneos-version-min=5.0
-      CXX += -miphoneos-version-min=5.0
-      PLATFORM_DEFINES := -miphoneos-version-min=5.0
+      MINVERSION += -miphoneos-version-min=5.0
    endif
+   CFLAGS += $(MINVERSION)
+   CXXFLAGS += $(MINVERSION)
 else ifeq ($(platform), tvos-arm64)
    TARGET := $(TARGET_NAME)_libretro_tvos.dylib
    fpic := -fPIC
@@ -80,6 +80,7 @@ else ifeq ($(platform), tvos-arm64)
    ARM_ASM = 0
    ASM_CPU = 0
    ASM_SPC700 = 0
+   CC = cc -arch arm64 -isysroot $(IOSSDK)
 else ifeq ($(platform), theos_ios)
    DEPLOYMENT_IOSVERSION = 5.0
    TARGET = iphone:latest:$(DEPLOYMENT_IOSVERSION)