diff options
| author | twinaphex <libretro@gmail.com> | 2021-05-29 09:55:57 +0200 |
|---|---|---|
| committer | twinaphex <libretro@gmail.com> | 2021-05-29 09:55:57 +0200 |
| commit | a01198f78a5eb4a31dfb798768f95850d9e1916f (patch) | |
| tree | c95a3da1dfa68f31ca81f18b55dfe3559748ff05 | |
| parent | 104e0e64924de5b4178fd5cd8cc305a812602596 (diff) | |
Add OSX x64 support
| -rw-r--r-- | .gitlab-ci.yml | 16 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | Makefile.libretro | 1 |
3 files changed, 19 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dbe7dff..dbf70e0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,6 +29,16 @@ include: - project: 'libretro-infrastructure/ci-templates'
file: '/linux-i686.yml'
+ # MacOS 64-bit
+ - project: 'libretro-infrastructure/ci-templates'
+ file: '/osx-x64.yml'
+
+ ################################## CELLULAR ################################
+ #
+ ################################## CONSOLES ################################
+ #
+ #################################### MISC ##################################
+
# Stages for building
stages:
- build-prepare
@@ -63,3 +73,9 @@ libretro-build-linux-i686: extends:
- .libretro-linux-i686-make-default
- .core-defs
+
+# MacOS 64-bit
+libretro-build-osx-x64:
+ extends:
+ - .libretro-osx-x64-make-default
+ - .core-defs
@@ -121,8 +121,10 @@ endif endif #libblastem.so ifeq ($(OS),Darwin) +ifneq ($(LIBRETRO),1) LDFLAGS+= -framework OpenGL -framework AppKit endif +endif endif #PORTABLE endif #Windows diff --git a/Makefile.libretro b/Makefile.libretro index 3650a9b..178ae19 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -1,5 +1,6 @@ UNAME=$(shell uname -s) UNAMEM=$(shell uname -m) +LIBRETRO=1 platform ?= unix |