diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 12f0aca..0f77ea6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,8 +127,6 @@ libretro-build-linux-i686: # MacOS 64-bit libretro-build-osx-x64: - tags: - - macosx-packaging extends: - .libretro-osx-x64-make-default - .core-defs @@ -142,8 +140,6 @@ libretro-build-osx-x64: # MacOS ARM 64-bit libretro-build-osx-arm64: - tags: - - macosx-packaging extends: - .libretro-osx-arm64-make-default - .core-defs @@ -176,24 +172,18 @@ android-x86_64: # iOS libretro-build-ios-arm64: - tags: - - macosx-packaging extends: - .libretro-ios-arm64-make-default - .core-defs # iOS (armv7) [iOS 9 and up] libretro-build-ios9: - tags: - - macosx-packaging extends: - .libretro-ios9-make-default - .core-defs-ptr64-null # tvOS libretro-build-tvos-arm64: - tags: - - macosx-packaging extends: - .libretro-tvos-arm64-make-default - .core-defs diff --git a/Makefile b/Makefile index 65ece36..b8ab9f0 100644 --- a/Makefile +++ b/Makefile @@ -236,12 +236,12 @@ ifeq ($(IOSSDK),) IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path) endif ifeq ($(platform),ios-arm64) - CC = c++ -arch arm64 -isysroot $(IOSSDK) - CXX = c++ -arch arm64 -isysroot $(IOSSDK) + CC = c++ -arch arm64 -isysroot $(IOSSDK) -miphoneos-version-min=8.0 + CXX = c++ -arch arm64 -isysroot $(IOSSDK) -miphoneos-version-min=8.0 PTR64 = 1 else - CC = c++ -arch armv7 -isysroot $(IOSSDK) - CXX = c++ -arch armv7 -isysroot $(IOSSDK) + CC = c++ -arch armv7 -isysroot $(IOSSDK) -miphoneos-version-min=5.0 + CXX = c++ -arch armv7 -isysroot $(IOSSDK) -miphoneos-version-min=5.0 endif CCOMFLAGS += -DSDLMAME_NO64BITIO -DIOS CFLAGS += -DIOS @@ -265,8 +265,8 @@ endif fpic = -fPIC SHARED := -dynamiclib PTR64 = 1 - CC = c++ -arch arm64 -isysroot $(IOSSDK) - CXX = c++ -arch arm64 -isysroot $(IOSSDK) + CC = c++ -arch arm64 -isysroot $(IOSSDK) -mappletvos-version-min=11.0 + CXX = c++ -arch arm64 -isysroot $(IOSSDK) -mappletvos-version-min=11.0 CCOMFLAGS += -DSDLMAME_NO64BITIO -DIOS CFLAGS += -DIOS CXXFLAGS += -DIOS