(Mac) Add Mac targets

This commit is contained in:
twinaphex 2021-01-28 16:49:00 +01:00
parent 0c07590bf4
commit b9ac392514
2 changed files with 102 additions and 2 deletions

View File

@ -82,6 +82,10 @@ include:
- project: 'libretro-infrastructure/ci-templates'
file: '/osx-x64.yml'
# MacOS ARM 64-bit
- project: 'libretro-infrastructure/ci-templates'
file: '/osx-arm64.yml'
################################## CELLULAR ################################
# Android
- project: 'libretro-infrastructure/ci-templates'
@ -157,6 +161,12 @@ libretro-build-osx-x64:
extends:
- .libretro-osx-x64-make-default
- .core-defs
# MacOS ARM 64-bit
libretro-build-osx-arm64:
extends:
- .libretro-osx-arm64-make-default
- .core-defs
################################### CELLULAR #################################
# Android ARMv7a
@ -255,6 +265,12 @@ libretro-build-osx-x64-x64sc:
- .libretro-osx-x64-make-default
- .core-defs-x64sc
# MacOS ARM 64-bit
libretro-build-osx-arm64-x64sc:
extends:
- .libretro-osx-arm64-make-default
- .core-defs-x64sc
################################### CELLULAR #################################
# Android ARMv7a
android-armeabi-v7a-x64sc:
@ -341,11 +357,17 @@ libretro-build-linux-i686-x128:
- .core-defs-x128
# MacOS 64-bit
libretro-build-osx-x128:
libretro-build-osx-x64-x128:
extends:
- .libretro-osx-x64-make-default
- .core-defs-x128
# MacOS ARM 64-bit
libretro-build-osx-arm64-x128:
extends:
- .libretro-osx-arm64-make-default
- .core-defs-x128
# Android
android-armeabi-v7a-x128:
extends:
@ -422,6 +444,18 @@ libretro-build-linux-i686-xcbm2:
- .libretro-linux-i686-make-default
- .core-defs-xcbm2
# MacOS 64-bit
libretro-build-osx-x64-xcbm2:
extends:
- .libretro-osx-x64-make-default
- .core-defs-xcbm2
# MacOS ARM 64-bit
libretro-build-osx-arm64-xcbm2:
extends:
- .libretro-osx-arm64-make-default
- .core-defs-xcbm2
# Android
android-armeabi-v7a-xcbm2:
extends:
@ -498,6 +532,18 @@ libretro-build-linux-i686-xcbm5x0:
- .libretro-linux-i686-make-default
- .core-defs-xcbm5x0
# MacOS 64-bit
libretro-build-osx-x64-xcbm5x0:
extends:
- .libretro-osx-x64-make-default
- .core-defs-xcbm5x0
# MacOS ARM 64-bit
libretro-build-osx-arm64-xcbm5x0:
extends:
- .libretro-osx-arm64-make-default
- .core-defs-xcbm5x0
# Android
android-armeabi-v7a-xcbm5x0:
extends:
@ -574,6 +620,18 @@ libretro-build-linux-i686-xpet:
- .libretro-linux-i686-make-default
- .core-defs-xpet
# MacOS 64-bit
libretro-build-osx-x64-xpet:
extends:
- .libretro-osx-x64-make-default
- .core-defs-xpet
# MacOS ARM 64-bit
libretro-build-osx-arm64-xpet:
extends:
- .libretro-osx-arm64-make-default
- .core-defs-xpet
# Android
android-armeabi-v7a-xpet:
extends:
@ -650,6 +708,18 @@ libretro-build-linux-i686-xplus4:
- .libretro-linux-i686-make-default
- .core-defs-xplus4
# MacOS 64-bit
libretro-build-osx-x64-xplus4:
extends:
- .libretro-osx-x64-make-default
- .core-defs-xplus4
# MacOS ARM 64-bit
libretro-build-osx-arm64-xplus4:
extends:
- .libretro-osx-arm64-make-default
- .core-defs-xplus4
# Android
android-armeabi-v7a-xplus4:
extends:
@ -726,6 +796,18 @@ libretro-build-linux-i686-xscpu64:
- .libretro-linux-i686-make-default
- .core-defs-xscpu64
# MacOS 64-bit
libretro-build-osx-x64-xscpu64:
extends:
- .libretro-osx-x64-make-default
- .core-defs-xscpu64
# MacOS ARM 64-bit
libretro-build-osx-arm64-xscpu64:
extends:
- .libretro-osx-arm64-make-default
- .core-defs-xscpu64
# Android
android-armeabi-v7a-xscpu64:
extends:
@ -802,6 +884,18 @@ libretro-build-linux-i686-xvic:
- .libretro-linux-i686-make-default
- .core-defs-xvic
# MacOS 64-bit
libretro-build-osx-x64-xvic:
extends:
- .libretro-osx-x64-make-default
- .core-defs-xvic
# MacOS ARM 64-bit
libretro-build-osx-arm64-xvic:
extends:
- .libretro-osx-arm64-make-default
- .core-defs-xvic
# Android
android-armeabi-v7a-xvic:
extends:

View File

@ -142,10 +142,16 @@ else ifeq ($(platform), osx)
ifeq ($(OSX_LT_MAVERICKS),YES)
fpic += -mmacosx-version-min=10.1
else
fpic += -stdlib=libc++
fpic += -stdlib=libc++
endif
CFLAGS += -DHAVE_STRLCPY -DHAVE_VSNPRINTF -DHAVE_SNPRINTF -DHAVE_STPCPY -D_INTTYPES_H
CXXFLAGS += -DHAVE_STRLCPY -DHAVE_VSNPRINTF -DHAVE_SNPRINTF -DHAVE_STPCPY -D_INTTYPES_H
ifeq ($(CROSS_COMPILE),1)
TARGET_RULE = -target $(LIBRETRO_APPLE_PLATFORM) -isysroot $(LIBRETRO_APPLE_ISYSROOT)
CFLAGS += $(TARGET_RULE)
CXXFLAGS += $(TARGET_RULE)
LDFLAGS += $(TARGET_RULE)
endif
# iOS
else ifneq (,$(findstring ios,$(platform)))