PS3 build fix (#208)

This commit is contained in:
crystalct 2022-02-05 14:03:13 +01:00 committed by GitHub
parent 4078fe424a
commit e8801687f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 29 additions and 32 deletions

View File

@ -228,37 +228,19 @@ else ifeq ($(platform), qnx)
AR = QCC -Vgcc_ntoarmv7le AR = QCC -Vgcc_ntoarmv7le
FLAGS += -D__BLACKBERRY_QNX__ -marm -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=softfp FLAGS += -D__BLACKBERRY_QNX__ -marm -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=softfp
# PS3 # Lightweight PS3 Homebrew SDK
else ifneq (,$(filter $(platform), ps3 sncps3 psl1ght)) else ifneq (,$(filter $(platform), ps3 psl1ght))
TARGET := $(TARGET_NAME)_libretro_ps3.a TARGET := $(TARGET_NAME)_libretro_$(platform).a
STATIC_LINKING = 1 STATIC_LINKING = 1
ENDIANNESS_DEFINES := -DMSB_FIRST -DBYTE_ORDER=BIG_ENDIAN ENDIANNESS_DEFINES := -DMSB_FIRST -DBYTE_ORDER=BIG_ENDIAN
CC = $(PS3DEV)/ppu/bin/ppu-$(COMMONLV)gcc$(EXE_EXT)
# sncps3 AR = $(PS3DEV)/ppu/bin/ppu-$(COMMONLV)ar$(EXE_EXT)
ifneq (,$(findstring sncps3,$(platform))) CXX = $(PS3DEV)/ppu/bin/ppu-$(COMMONLV)g++$(EXE_EXT)
CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe ifeq ($(platform), psl1ght)
CXX = $(CC) FLAGS += -D__PSL1GHT__
AR = $(CELL_SDK)/host-win32/sn/bin/ps3snarl.exe endif
FLAGS += -DARCH_POWERPC_ALTIVEC FLAGS += -DARCH_POWERPC_ALTIVEC -D__PS3__ -DUSE_LIBRETRO_VFS
CXXFLAGS += -Xc+=exceptions OLD_GCC := 1
OLD_GCC := 1
NO_GCC := 1
# PS3
else ifneq (,$(findstring ps3,$(platform)))
CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
CXX = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-g++.exe
AR = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ar.exe
FLAGS += -DARCH_POWERPC_ALTIVEC
OLD_GCC := 1
# Lightweight PS3 Homebrew SDK
else ifneq (,$(findstring psl1ght,$(platform)))
TARGET := $(TARGET_NAME)_libretro_$(platform).a
CC = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT)
CXX = $(PS3DEV)/ppu/bin/ppu-g++$(EXE_EXT)
AR = $(PS3DEV)/ppu/bin/ppu-ar$(EXE_EXT)
endif
# PSP # PSP
else ifeq ($(platform), psp1) else ifeq ($(platform), psp1)

View File

@ -20,6 +20,14 @@ typedef int32_t INT32;
typedef int16_t INT16; typedef int16_t INT16;
typedef int8_t INT8; typedef int8_t INT8;
#ifdef USE_LIBRETRO_VFS
#define core_file RFILE
#define core_fopen(file) rfopen(file, "rb")
#define core_fseek rfseek
#define core_ftell rftell
#define core_fread(fc, buff, len) fread(buff, 1, len, fc)
#define core_fclose rfclose
#else /* USE_LIBRETRO_VFS */
#define core_file FILE #define core_file FILE
#define core_fopen(file) fopen(file, "rb") #define core_fopen(file) fopen(file, "rb")
#if defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(__WIN64__) #if defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(__WIN64__)
@ -34,6 +42,7 @@ typedef int8_t INT8;
#endif #endif
#define core_fread(fc, buff, len) fread(buff, 1, len, fc) #define core_fread(fc, buff, len) fread(buff, 1, len, fc)
#define core_fclose fclose #define core_fclose fclose
#endif /* USE_LIBRETRO_VFS */
static UINT64 core_fsize(core_file *f) static UINT64 core_fsize(core_file *f)
{ {

View File

@ -48,9 +48,9 @@
#include <libchdr/flac.h> #include <libchdr/flac.h>
#include <libchdr/huffman.h> #include <libchdr/huffman.h>
#include "zlib.h"
#include "LzmaEnc.h" #include "LzmaEnc.h"
#include "LzmaDec.h" #include "LzmaDec.h"
#include "zlib.h"
#undef TRUE #undef TRUE
#undef FALSE #undef FALSE

View File

@ -63,7 +63,9 @@ typedef int WRes;
#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; } #define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; }
#endif #endif
#ifndef ZCONF_H
typedef unsigned char Byte; typedef unsigned char Byte;
#endif
typedef short Int16; typedef short Int16;
typedef unsigned short UInt16; typedef unsigned short UInt16;

View File

@ -30,6 +30,10 @@
#include "mednafen/msvc_compat.h" #include "mednafen/msvc_compat.h"
#endif #endif
#ifdef __PS3__
using namespace std;
#endif
std::string retro_base_directory; std::string retro_base_directory;
#define MEDNAFEN_CORE_NAME_MODULE "pce_fast" #define MEDNAFEN_CORE_NAME_MODULE "pce_fast"