libretro/mame2010-libretro
1
0
Fork 0
mirror of https://github.com/libretro/mame2010-libretro.git synced 2024-11-27 01:51:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #161 from warmenhoven/warmenhoven/pr/apple

Browse Source 
apple CI: fix various build issues
This commit is contained in:
LibretroAdmin 2024-10-21 16:48:21 -05:00 committed by GitHub
commit fb0111748a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitlab-ci.yml
View File

@ -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

12
Makefile
View File

@ -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