libretro/parallel-n64
1
0 Fork 0
mirror of https://github.com/libretro/parallel-n64.git synced 2026-11-07 18:37:22 -10:00
Code Issues Packages Projects Releases Wiki Activity

Fixing builds on mac, disabling builds on ios

Browse Source
This commit is contained in:
Eric Warmenhoven committed 2024-01-20 11:07:31 -05:00
1 parent a537da27a2
commit 52fc98dde1
3 files changed
+35 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.gitlab-ci.yml
+29 -10
View File
@@ -32,6 +32,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 ################################
# iOS
- project: 'libretro-infrastructure/ci-templates'
@@ -105,16 +109,31 @@ libretro-build-osx-x64:
extends:
- .libretro-osx-x64-make-default
- .core-defs
variables:
HAVE_THR_AL: 1
# MacOS arm64
libretro-build-osx-arm64:
extends:
- .libretro-osx-arm64-make-default
- .core-defs
variables:
HAVE_THR_AL: 1
WITH_DYNAREC: aarch64
################################### CELLULAR #################################
# iOS
libretro-build-ios-arm64:
extends:
- .libretro-ios-arm64-make-default
- .core-defs
# # iOS
# libretro-build-ios-arm64:
# extends:
# - .libretro-ios-arm64-make-default
# - .core-defs
# variables:
# HAVE_THR_AL: 1
# iOS (armv7) [iOS 9 and up]
libretro-build-ios9:
extends:
- .libretro-ios9-make-default
- .core-defs
# # iOS (armv7) [iOS 9 and up]
# libretro-build-ios9:
# extends:
# - .libretro-ios9-make-default
# - .core-defs
# variables:
# HAVE_THR_AL: 1
Makefile
+2 -1
View File
@@ -303,9 +303,10 @@ else ifneq (,$(findstring osx,$(platform)))
CPUFLAGS += -fno-stack-protector -fomit-frame-pointer
HAVE_NEON=1
MINVERSION := -mmacosx-version-min=11.0
WITH_DYNAREC = aarch64
endif
TARGET_RULE = -target $(LIBRETRO_APPLE_PLATFORM)
TARGET_RULE = -target $(LIBRETRO_APPLE_PLATFORM) -isysroot $(LIBRETRO_APPLE_ISYSROOT)
CFLAGS += $(TARGET_RULE)
CPPFLAGS += $(TARGET_RULE)
CXXFLAGS += $(TARGET_RULE)
mupen64plus-core/src/ext/libpl.c
+4
View File
@@ -9,7 +9,9 @@
#include "../util/random.h"
#include "../util/version.h"
#include "../../../Graphics/plugin.h"
#if defined(HAVE_PARALLEL)
#include "../../../mupen64plus-video-paraLLEl/parallel.h"
#endif
#define LIBPL_PIPE_BUFFER_SIZE 4096
@@ -91,6 +93,7 @@ static inline void handle_emu_cmd( uint16_t commandId, uint16_t payloadSize ) {
g_libplBuffer[4] = 0x6e000000u;
break;
}
#if defined(HAVE_PARALLEL)
case GFX_PARALLEL: {
g_libplBuffer[0] = 13;
g_libplBuffer[1] = PLUGIN_ID_PARALLELN64 | PLUGIN_CAPABILITY_FBE | PLUGIN_CAPABILITY_DEPTH;
@@ -100,6 +103,7 @@ static inline void handle_emu_cmd( uint16_t commandId, uint16_t payloadSize ) {
g_libplBuffer[4] = 0;
break;
}
#endif
case GFX_GLIDEN64: {
if( LegacySm64ToolsHacks ) {
g_libplBuffer[0] = 9;