mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-01 07:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Should build valid ARM64 binaries now

Browse Source
This commit is contained in:
twinaphex 2021-02-17 01:11:21 +01:00
parent 91365098f7
commit 39cf159e98
2 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -448,6 +448,9 @@ build-retroarch-metal-osx-x64:
build-retroarch-metal-osx-arm64:
tags:
- macosx
variables:
LIBRETRO_APPLE_PLATFORM: arm64-apple-macos10.15
LIBRETRO_APPLE_ISYSROOT: /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
stage: build
before_script:
- export NUMPROC=$((1 + $(sysctl -n hw.ncpu)/3))
@ -464,7 +467,7 @@ build-retroarch-metal-osx-arm64:
script:
# Normal RetroArch Metal (ARM64) Build
- ./configure --enable-metal --disable-al
- make -j$NUMPROC
- make ARCH=arm64 BUILDBOT=1 -j$NUMPROC
# Cleanup for DMG creation
- rm -rvf "RetroArch_ARM64.app/"
@ -997,3 +1000,4 @@ trigger_static-cores:
script:
# Dummy for now
- /bin/true

44
Makefile.common
View File

@ -130,40 +130,45 @@ endif
ifneq ($(findstring Darwin,$(OS)),)
OSX := 1
LIBS += -framework AppKit
DARWINFLAGS=
ARCHFLAGS=
MINVERFLAGS=
ifeq ($(shell uname -p),arm)
DARWINFLAGS = -mmacosx-version-min=10.15 -stdlib=libc++ # macOS (Metal, ARM 64bit)
DARWINFLAGS += -DDONT_WANT_ARM_OPTIMIZATIONS
MINVERFLAGS = -mmacosx-version-min=10.15 -stdlib=libc++ # macOS (Metal, ARM 64bit)
MINVERFLAGS += -DDONT_WANT_ARM_OPTIMIZATIONS
else ifeq ($(HAVE_METAL),1)
DARWINFLAGS = -mmacosx-version-min=10.13 -stdlib=libc++ # macOS (Metal, x86 64bit)
MINVERFLAGS = -mmacosx-version-min=10.13 -stdlib=libc++ # macOS (Metal, x86 64bit)
else ifeq ($(shell uname -p),powerpc)
DARWINFLAGS = -mmacosx-version-min=10.5 # macOSX (PowerPC 32-bit)
MINVERFLAGS = -mmacosx-version-min=10.5 # macOSX (PowerPC 32-bit)
else ifeq ($(shell uname -m),i386)
DARWINFLAGS = -mmacosx-version-min=10.6 # macOSX (OpenGL, x86 32bit)
MINVERFLAGS = -mmacosx-version-min=10.6 # macOSX (OpenGL, x86 32bit)
else
DARWINFLAGS = -mmacosx-version-min=10.7 -stdlib=libc++ # macOSX (OpenGL, x86 64bit)
MINVERFLAGS = -mmacosx-version-min=10.7 -stdlib=libc++ # macOSX (OpenGL, x86 64bit)
endif
# Build for a specific architecture when ARCH is defined as a switch
ifeq ($(ARCH),arm64)
DARWINFLAGS = -mmacosx-version-min=10.15 -stdlib=libc++ # macOS (Metal, ARM 64bit)
DARWINFLAGS += -DDONT_WANT_ARM_OPTIMIZATIONS
DARWINFLAGS += -arch arm64
MINVERFLAGS = -mmacosx-version-min=10.15 -stdlib=libc++ # macOS (Metal, ARM 64bit)
MINVERFLAGS += -DDONT_WANT_ARM_OPTIMIZATIONS
ARCHFLAGS = -arch arm64
else ifeq ($(ARCH),x86_64)
ifeq ($(HAVE_METAL),1)
DARWINFLAGS = -mmacosx-version-min=10.13 -stdlib=libc++
MINVERFLAGS = -mmacosx-version-min=10.13 -stdlib=libc++
else
DARWINFLAGS = -mmacosx-version-min=10.7 -stdlib=libc++
MINVERFLAGS = -mmacosx-version-min=10.7 -stdlib=libc++
endif
DARWINFLAGS += -arch x86_64
ARCHFLAGS = -arch x86_64
else ifeq ($(ARCH),x86)
DARWINFLAGS = -mmacosx-version-min=10.6
DARWINFLAGS += -arch x86
MINVERFLAGS = -mmacosx-version-min=10.6
ARCHFLAGS = -arch x86
else ifeq ($(ARCH),ppc)
DARWINFLAGS = -mmacosx-version-min=10.5
DARWINFLAGS += -arch ppc
MINVERFLAGS = -mmacosx-version-min=10.5
ARCHFLAGS = -arch ppc
endif
DEF_FLAGS += $(DARWINFLAGS)
LDFLAGS += $(DARWINFLAGS)
ifeq ($(BUILDBOT),1)
ARCHFLAGS = -target $(LIBRETRO_APPLE_PLATFORM) -isysroot $(LIBRETRO_APPLE_ISYSROOT)
endif
DEF_FLAGS += $(MINVERFLAGS) $(ARCHFLAGS)
LDFLAGS += $(MINVERFLAGS) $(ARCHFLAGS)
else
OSX := 0
endif
@ -2466,3 +2471,4 @@ ifeq ($(HAVE_ODROIDGO2), 1)
endif
##################################