diff options
| author | twinaphex | 2020-12-19 22:57:49 +0100 |
|---|---|---|
| committer | twinaphex | 2020-12-19 22:57:49 +0100 |
| commit | e007af22a60de6fac7df11f6ea8c3ef1a1d6ac24 (patch) | |
| tree | 01a722496f5dd02304140e0fd96c391c50e98d74 | |
| parent | 4bc5e3507d00a20344ad3fbf2571b66e9a8640ea (diff) | |
| download | pcsx_rearmed-e007af22a60de6fac7df11f6ea8c3ef1a1d6ac24.tar.gz pcsx_rearmed-e007af22a60de6fac7df11f6ea8c3ef1a1d6ac24.tar.bz2 pcsx_rearmed-e007af22a60de6fac7df11f6ea8c3ef1a1d6ac24.zip | |
Update
| -rw-r--r-- | Makefile.libretro | 14 | ||||
| -rw-r--r-- | deps/flac-1.3.2/src/libFLAC/stream_decoder.c | 8 | ||||
| -rw-r--r-- | libretro-common/include/libretro.h | 2 |
3 files changed, 1 insertions, 23 deletions
diff --git a/Makefile.libretro b/Makefile.libretro index 87b35f7..6a436ed 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -151,20 +151,6 @@ else ifeq ($(platform), arm64) CFLAGS := $(filter-out -O2, $(CFLAGS)) CFLAGS += -O3 -ftree-vectorize -# PS3 -else ifeq ($(platform), ps3) - TARGET := $(TARGET_NAME)_libretro_ps3.a - CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe - AR = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ar.exe - CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__ - -# sncps3 -else ifeq ($(platform), sncps3) - TARGET := $(TARGET_NAME)_libretro_ps3.a - CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe - AR = $(CELL_SDK)/host-win32/sn/bin/ps3snarl.exe - CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__ - # Lightweight PS3 Homebrew SDK else ifeq ($(platform), psl1ght) TARGET := $(TARGET_NAME)_libretro_psl1ght.a diff --git a/deps/flac-1.3.2/src/libFLAC/stream_decoder.c b/deps/flac-1.3.2/src/libFLAC/stream_decoder.c index 7c8a26e..d364b0c 100644 --- a/deps/flac-1.3.2/src/libFLAC/stream_decoder.c +++ b/deps/flac-1.3.2/src/libFLAC/stream_decoder.c @@ -3356,11 +3356,7 @@ FLAC__StreamDecoderSeekStatus file_seek_callback_(const FLAC__StreamDecoder *dec if(decoder->private_->file == stdin) return FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED; -#ifdef __CELLOS_LV2__ - else if(fseek(decoder->private_->file, (FLAC__off_t)absolute_byte_offset, SEEK_SET) < 0) -#else else if(fseeko(decoder->private_->file, (FLAC__off_t)absolute_byte_offset, SEEK_SET) < 0) -#endif return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR; else return FLAC__STREAM_DECODER_SEEK_STATUS_OK; @@ -3373,11 +3369,7 @@ FLAC__StreamDecoderTellStatus file_tell_callback_(const FLAC__StreamDecoder *dec if(decoder->private_->file == stdin) return FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED; -#ifdef __CELLOS_LV2__ - else if((pos = ftell(decoder->private_->file)) < 0) -#else else if((pos = ftello(decoder->private_->file)) < 0) -#endif return FLAC__STREAM_DECODER_TELL_STATUS_ERROR; else { *absolute_byte_offset = (FLAC__uint64)pos; diff --git a/libretro-common/include/libretro.h b/libretro-common/include/libretro.h index 20b4cd2..833dfed 100644 --- a/libretro-common/include/libretro.h +++ b/libretro-common/include/libretro.h @@ -69,7 +69,7 @@ extern "C" { # endif # endif # else -# if defined(__GNUC__) && __GNUC__ >= 4 && !defined(__CELLOS_LV2__) +# if defined(__GNUC__) && __GNUC__ >= 4 # define RETRO_API RETRO_CALLCONV __attribute__((__visibility__("default"))) # else # define RETRO_API RETRO_CALLCONV |