aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml26
-rw-r--r--Makefile14
2 files changed, 31 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc81930..f201244 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,7 +60,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'
@@ -93,6 +97,10 @@ include:
- project: 'libretro-infrastructure/ci-templates'
file: '/dingux-mips32.yml'
+ # tvOS (AppleTV)
+ - project: 'libretro-infrastructure/ci-templates'
+ file: '/tvos-arm64.yml'
+
#################################### MISC ##################################
# Emscripten
- project: 'libretro-infrastructure/ci-templates'
@@ -191,11 +199,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 Portable
diff --git a/Makefile b/Makefile
index beff1c9..e00f108 100644
--- a/Makefile
+++ b/Makefile
@@ -137,6 +137,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)
@@ -151,14 +152,13 @@ else
endif
ifeq ($(platform),$(filter $(platform),ios9 ios-arm64))
- SHARED += -miphoneos-version-min=8.0
- CC += -miphoneos-version-min=8.0
- CXX += -miphoneos-version-min=8.0
+ MINVERSION = -miphoneos-version-min=8.0
else
- SHARED += -miphoneos-version-min=5.0
- CC += -miphoneos-version-min=5.0
- CXX += -miphoneos-version-min=5.0
+ MINVERSION = -miphoneos-version-min=5.0
endif
+ SHARED += $(MINVERSION)
+ CC += $(MINVERSION)
+ CXX += $(MINVERSION)
# tvOS
else ifeq ($(platform), tvos-arm64)
TARGET := $(TARGET_NAME)_libretro_tvos.dylib
@@ -168,6 +168,8 @@ else ifeq ($(platform), tvos-arm64)
ifeq ($(IOSSDK),)
IOSSDK := $(shell xcodebuild -version -sdk appletvos Path)
endif
+ CFLAGS += -DIOS
+ CC = cc -arch arm64 -isysroot $(IOSSDK)
# Theos iOS
else ifeq ($(platform), theos_ios)