Unverified Commit 39f315ff authored by Libretro-Admin's avatar Libretro-Admin Committed by GitHub
Browse files

Merge pull request #37 from crystalct/master

PS3/PSL1GHT build fix
parents 0812e619 cb9b1dcf
Pipeline #86076 passed with stages
in 22 minutes and 34 seconds
......@@ -199,19 +199,18 @@ else ifeq ($(platform), qnx)
AR = QCC -Vgcc_ntoarmv7le
FLAGS += -D__BLACKBERRY_QNX__ -marm -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=softfp
# PS3
else ifneq (,$(filter $(platform), psl1ght))
TARGET := $(TARGET_NAME)_libretro_ps3.a
STATIC_LINKING = 1
ENDIANNESS_DEFINES := -DMSB_FIRST -DBYTE_ORDER=BIG_ENDIAN
# Lightweight PS3 Homebrew SDK
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
# Lightweight PS3 Homebrew SDK
else ifneq (,$(filter $(platform), ps3 psl1ght))
TARGET := $(TARGET_NAME)_libretro_$(platform).a
STATIC_LINKING = 1
ENDIANNESS_DEFINES := -DMSB_FIRST -DBYTE_ORDER=BIG_ENDIAN
FLAGS += -D__PS3__ -DUSE_LIBRETRO_VFS
CC = $(PS3DEV)/ppu/bin/ppu-$(COMMONLV)gcc$(EXE_EXT)
CXX = $(PS3DEV)/ppu/bin/ppu-$(COMMONLV)g++$(EXE_EXT)
AR = $(PS3DEV)/ppu/bin/ppu-$(COMMONLV)ar$(EXE_EXT)
ifeq ($(platform), psl1ght)
FLAGS += -D__PSL1GHT__
endif
# PSP
else ifeq ($(platform), psp1)
......
......@@ -20,6 +20,14 @@ typedef int32_t INT32;
typedef int16_t INT16;
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
#define core_file FILE
#define core_fopen(file) fopen(file, "rb")
#if defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(__WIN64__)
......@@ -34,6 +42,7 @@ typedef int8_t INT8;
#endif
#define core_fread(fc, buff, len) fread(buff, 1, len, fc)
#define core_fclose fclose
#endif /* USE_LIBRETRO_VFS */
static UINT64 core_fsize(core_file *f)
{
......
......@@ -63,7 +63,10 @@ typedef int WRes;
#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; }
#endif
#if !defined(__BYTE_DEFINED__)
typedef unsigned char Byte;
#define __BYTE_DEFINED__
#endif
typedef short Int16;
typedef unsigned short UInt16;
......
......@@ -387,8 +387,9 @@
# define FAR
#endif
#if !defined(__MACTYPES__)
#if !defined(__MACTYPES__) && !defined(__BYTE_DEFINED__)
typedef unsigned char Byte; /* 8 bits */
#define __BYTE_DEFINED__
#endif
typedef unsigned int uInt; /* 16 bits or more */
typedef unsigned long uLong; /* 32 bits or more */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment