admin/ci-libretro-fceumm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #417 from fjtrujy/PS2NewToolchain

Browse Source 
[Ps2] Update to new toolchain
This commit is contained in:
Autechre
2021-01-15 00:48:47 +01:00
committed by GitHub
parent 18d601bd03 c85ab05800
commit b0d4d4a856
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.libretro
View File

@@ -150,8 +150,8 @@ else ifeq ($(platform), qnx)
# PS2 # PS2
else ifeq ($(platform), ps2) else ifeq ($(platform), ps2)
TARGET := $(TARGET_NAME)_libretro_$(platform).a TARGET := $(TARGET_NAME)_libretro_$(platform).a
CC = ee-gcc$(EXE_EXT) CC = mips64r5900el-ps2-elf-gcc$(EXE_EXT)
AR = ee-ar$(EXE_EXT) AR = mips64r5900el-ps2-elf-ar$(EXE_EXT)
FCEU_DEFINES := -DPATH_MAX=1024 -DINLINE=inline -DPSS_STYLE=1 -DFCEU_VERSION_NUMERIC=9813 -DHAVE_ASPRINTF FCEU_DEFINES := -DPATH_MAX=1024 -DINLINE=inline -DPSS_STYLE=1 -DFCEU_VERSION_NUMERIC=9813 -DHAVE_ASPRINTF
ENDIANNESS_DEFINES := -DLSB_FIRST -DLOCAL_LE=1 ENDIANNESS_DEFINES := -DLSB_FIRST -DLOCAL_LE=1
PLATFORM_DEFINES := -DPS2 -D_EE -G0 -DFRONTEND_SUPPORTS_ABGR1555 -DRENDER_GSKIT_PS2 PLATFORM_DEFINES := -DPS2 -D_EE -G0 -DFRONTEND_SUPPORTS_ABGR1555 -DRENDER_GSKIT_PS2
@@ -790,11 +790,6 @@ endif
%.o: %.c %.o: %.c
$(CC) -c $(OBJOUT)$@ $< $(CFLAGS) $(INCFLAGS) $(CC) -c $(OBJOUT)$@ $< $(CFLAGS) $(INCFLAGS)
ifeq ($(platform), ps2)
%.o: %.s
ee-as -G0 $< -o $@
endif
clean-objs: clean-objs:
rm -f $(OBJECTS) rm -f $(OBJECTS)

8
src/drivers/libretro/libretro.c
View File

@@ -28,6 +28,10 @@
#include "../../vsuni.h" #include "../../vsuni.h"
#include "../../video.h" #include "../../video.h"
#ifdef PSP
#include "pspgu.h"
#endif
#if defined(RENDER_GSKIT_PS2) #if defined(RENDER_GSKIT_PS2)
#include "libretro-common/include/libretro_gskit_ps2.h" #include "libretro-common/include/libretro_gskit_ps2.h"
#endif #endif
@@ -159,8 +163,8 @@ static unsigned opt_showAdvSoundOptions = 0;
static unsigned opt_showAdvSystemOptions = 0; static unsigned opt_showAdvSystemOptions = 0;
int FCEUnetplay; int FCEUnetplay;
#ifdef PSP
#include "pspgu.h" #if defined(PSP) || defined(PS2)
static __attribute__((aligned(16))) uint16_t retro_palette[256]; static __attribute__((aligned(16))) uint16_t retro_palette[256];
#else #else
static uint16_t retro_palette[256]; static uint16_t retro_palette[256];