This commit is contained in:
twinaphex 2020-12-20 21:11:35 +01:00
parent aedbf12d4d
commit 82a9a59d20
4 changed files with 3 additions and 19 deletions

View File

@ -149,8 +149,8 @@ else ifeq ($(platform), psl1ght)
CXX = $(PS3DEV)/ppu/bin/ppu-g++$(EXE_EXT)
CC_AS = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT)
AR = $(PS3DEV)/ppu/bin/ppu-ar$(EXE_EXT)
CFLAGS += -D__CELLOS_LV2__ -D__PSL1GHT__ -mcpu=cell -D_XOPEN_SOURCE=500 -DSYNC_CDROM=1
CXXFLAGS += -D__CELLOS_LV2__ -D__PSL1GHT__ -mcpu=cell -DDISABLE_AUDIO_THREAD=1 -D_XOPEN_SOURCE=500 -DSYNC_CDROM=1
CFLAGS += -D__PSL1GHT__ -mcpu=cell -D_XOPEN_SOURCE=500 -DSYNC_CDROM=1
CXXFLAGS += -D__PSL1GHT__ -mcpu=cell -DDISABLE_AUDIO_THREAD=1 -D_XOPEN_SOURCE=500 -DSYNC_CDROM=1
STATIC_LINKING = 1
else
CC ?= gcc

@ -1 +1 @@
Subproject commit e0ee203e3e33fcb9964380531ca32d209aeaac0c
Subproject commit 26490decd01a95e9f32841fbb252b3cb6354e96f

View File

@ -3336,11 +3336,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;
@ -3353,11 +3349,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;

View File

@ -4373,11 +4373,7 @@ FLAC__StreamEncoderReadStatus file_read_callback_(const FLAC__StreamEncoder *enc
FLAC__StreamEncoderSeekStatus file_seek_callback_(const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data)
{
(void)client_data;
#ifdef __CELLOS_LV2__
if(fseek(encoder->private_->file, (FLAC__off_t)absolute_byte_offset, SEEK_SET) < 0)
#else
if(fseeko(encoder->private_->file, (FLAC__off_t)absolute_byte_offset, SEEK_SET) < 0)
#endif
return FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR;
else
return FLAC__STREAM_ENCODER_SEEK_STATUS_OK;
@ -4388,11 +4384,7 @@ FLAC__StreamEncoderTellStatus file_tell_callback_(const FLAC__StreamEncoder *enc
FLAC__off_t offset;
(void)client_data;
#ifdef __CELLOS_LV2__
offset = ftell(encoder->private_->file);
#else
offset = ftello(encoder->private_->file);
#endif
if(offset < 0) {
return FLAC__STREAM_ENCODER_TELL_STATUS_ERROR;