Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Libretro
cannonball
Commits
91892a2f
Commit
91892a2f
authored
Jan 29, 2021
by
Libretro-Admin
Browse files
(macOS) Add ARM 64bit MacOS support
parent
131be528
Pipeline
#12984
passed with stages
in 2 minutes and 46 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
91892a2f
...
...
@@ -32,6 +32,10 @@ include:
# MacOS 64-bit
-
project
:
'
libretro-infrastructure/ci-templates'
file
:
'
/osx-x64.yml'
# MacOS ARM 64-bit
-
project
:
'
libretro-infrastructure/ci-templates'
file
:
'
/osx-arm64.yml'
################################## CELLULAR ################################
# Android
...
...
@@ -103,6 +107,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
...
...
Makefile
View file @
91892a2f
...
...
@@ -20,6 +20,9 @@ ifeq ($(platform),)
else
ifneq
($(findstring Darwin,$(shell uname -a)),)
platform
=
osx
arch
=
intel
ifeq
($(shell uname -p),arm)
arch
=
arm
endif
ifeq
($(shell uname -p),powerpc)
arch
=
ppc
endif
...
...
@@ -46,11 +49,6 @@ ifneq ($(GIT_VERSION)," unknown")
CXXFLAGS
+=
-DGIT_VERSION
=
\"
$(GIT_VERSION)
\"
endif
arch
=
intel
ifeq
($(shell uname -p),powerpc)
arch
=
ppc
endif
# Unix
ifneq
(,$(findstring unix,$(platform)))
TARGET
:=
$(TARGET_NAME)
_libretro.so
...
...
@@ -94,9 +92,33 @@ else ifeq ($(platform), osx)
ENDIANNESS_DEFINES
:=
-DMSB_FIRST
-DBYTE_ORDER
=
BIG_ENDIAN
OLD_GCC
:=
1
endif
OSXVER
=
`
sw_vers
-productVersion
|
cut
-d
.
-f
2
`
OSX_LT_MAVERICKS
=
`
((
$(OSXVER)
<
=
9
))
&&
echo
"YES"
`
fpic
+=
-mmacosx-version-min
=
10.9
MINVERSION
=
ifeq
($(OSX_LT_MAVERICKS),YES)
else
MINVERSION
=
-mmacosx-version-min
=
10.9
endif
arch
=
intel
ifeq
($(shell uname -p),powerpc)
arch
=
ppc
endif
ifeq
($(shell uname -p),arm)
arch
=
arm
MINVERSION
=
endif
ifeq
($(CROSS_COMPILE),1)
TARGET_RULE
=
-target
$(LIBRETRO_APPLE_PLATFORM)
-isysroot
$(LIBRETRO_APPLE_ISYSROOT)
CFLAGS
+=
$(TARGET_RULE)
CPPFLAGS
+=
$(TARGET_RULE)
CXXFLAGS
+=
$(TARGET_RULE)
LDFLAGS
+=
$(TARGET_RULE)
endif
fpic
+=
$(MINVERSION)
# iOS
else
ifneq
(,$(findstring ios,$(platform)))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment