libretro-mirrors · crystalct · Mar 22, 2022
diff --git a/audio/softsynth/mt32/File.cpp b/audio/softsynth/mt32/File.cpp
@@ -22,6 +22,10 @@
 #include "File.h"
 #include "sha1/sha1.h"
 
+#ifdef __PS3__
+using namespace std;
+#endif
+
 namespace MT32Emu {
 
 AbstractFile::AbstractFile() : sha1DigestCalculated(false) {

diff --git a/audio/softsynth/mt32/ROMInfo.cpp b/audio/softsynth/mt32/ROMInfo.cpp
@@ -21,6 +21,10 @@
 
 #include "ROMInfo.h"
 
+#ifdef __PS3__
+using namespace std;
+#endif
+
 namespace MT32Emu {
 
 static const ROMInfo *getKnownROMInfoFromList(Bit32u index) {

diff --git a/audio/softsynth/mt32/Synth.h b/audio/softsynth/mt32/Synth.h
@@ -26,6 +26,10 @@
 #include "Types.h"
 #include "Enumerations.h"
 
+#ifdef __PS3__
+using namespace std;
+#endif
+
 namespace MT32Emu {
 
 class Analog;

diff --git a/audio/softsynth/mt32/mmath.h b/audio/softsynth/mt32/mmath.h
@@ -20,6 +20,10 @@
 
 #include <cmath>
 
+#ifdef __PS3__
+using namespace std;
+#endif
+
 namespace MT32Emu {
 
 // Mathematical constants

diff --git a/backends/fs/libretro/libretro-fs.h b/backends/fs/libretro/libretro-fs.h
@@ -30,7 +30,9 @@
 #endif
 #include <unistd.h>
 
-#ifdef PLAYSTATION3
+#if defined(__PS3__) && !defined(__PSL1GHT__)
+#include <cell/cell_fs.h>
+#include <sys/stat.h>
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 #define	F_OK		0	/* test for existence of file */
 #define	W_OK		0x02	/* test for write permission */
@@ -88,7 +90,15 @@ class LibRetroFilesystemNode : public AbstractFSNode {
 	 */
 	LibRetroFilesystemNode(const Common::String &path);
 
+#if defined(__PS3__) && !defined(__PSL1GHT__)
+	virtual bool exists() const {
+		CellFsStat entry;
+		cellFsStat(_path.c_str(), &entry);
+		return access(_path.c_str(), F_OK) == 0 || (entry.st_mode & S_IFDIR) != 0;
+	}
+#else
 	virtual bool exists() const { return access(_path.c_str(), F_OK) == 0; }
+#endif
 	virtual Common::String getDisplayName() const { return _displayName; }
 	virtual Common::String getName() const { return _displayName; }
 	virtual Common::String getPath() const { return _path; }

diff --git a/backends/platform/libretro/build/Makefile b/backends/platform/libretro/build/Makefile
@@ -182,14 +182,22 @@ else ifeq ($(platform), genode)
    AR  = $(shell pkg-config genode-base --variable=ar) rcs
    RANLIB = genode-x86-ranlib
 
-# PS3
-else ifeq ($(platform), ps3)
+# Lightweight PS3 Homebrew SDK
+else ifneq (,$(filter $(platform), ps3 psl1ght))
    TARGET  := $(TARGET_NAME)_libretro_$(platform).a
-   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 rcs
-   DEFINES += -DPLAYSTATION3
-	STATIC_LINKING=1
+   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) rcs
+   AR_NOPAR = $(PS3DEV)/ppu/bin/ppu-$(COMMONLV)ar$(EXE_EXT)
+   DEFINES += -DPLAYSTATION3 -DWORDS_BIGENDIAN=1 -DMSB_FIRST -D__ppc__ -DNO_GETENV -D__PS3__
+   STATIC_LINKING=1
+   ifeq ($(platform), psl1ght)
+        PLATFORM_DEFINES += -D__PSL1GHT__
+   endif
+   ifneq (,$(findstring MINGW32,$(shell uname -a)))
+		PS3MINGW32 := 1
+   endif
+   LITE := 1
 
 # Nintendo Wii
 else ifeq ($(platform), wii)
@@ -561,6 +569,16 @@ $(TARGET): $(OBJS) libdeps.a
 	$(MKDIR) libtemp
 	cp $+ libtemp/
 	$(AR) -M < ctr.mri
+else ifeq ($(PS3MINGW32), 1)
+$(TARGET): $(OBJS) libdeps.a
+	$(HIDE)echo Linking $@...
+	$(HIDE)$(AR) $@ $(shell find ../ -maxdepth 1 -mindepth 1 -name '*.o')
+	$(HIDE)$(AR_NOPAR) q $@ $(shell find ../ -maxdepth 2 -mindepth 2 -name '*.o')
+	$(HIDE)$(AR_NOPAR) q $@ $(shell find ../ -maxdepth 3 -mindepth 3 -name '*.o')
+	$(HIDE)$(AR_NOPAR) q $@ $(shell find ../ -maxdepth 4 -mindepth 4 -name '*.o')
+	$(HIDE)$(AR_NOPAR) q $@ $(shell find ../ -maxdepth 5 -mindepth 5 -name '*.o')
+	$(HIDE)$(AR_NOPAR) q $@ $(shell find ../ -maxdepth 6 -mindepth 6 -name '*.o')
+	$(HIDE)$(AR_NOPAR) q $@ $(shell find ../ -maxdepth 7 -mindepth 7 -name '*.o')
 else ifeq ($(STATIC_LINKING), 1)
 $(TARGET): $(OBJS) libdeps.a 
 	@echo Linking $@...

diff --git a/backends/platform/libretro/deps/freetype/src/base/ftinit.c b/backends/platform/libretro/deps/freetype/src/base/ftinit.c
@@ -44,6 +44,9 @@
 #include FT_MODULE_H
 #include "basepic.h"
 
+#ifdef __PS3__
+#define getenv(x) NULL
+#endif
 
   /*************************************************************************/
   /*                                                                       */

diff --git a/backends/platform/libretro/deps/libfaad/config.h b/backends/platform/libretro/deps/libfaad/config.h
@@ -52,7 +52,9 @@
 #undef HAVE_STRCHR
 
 /* Define to 1 if you have the <strings.h> header file. */
+#ifndef __PS3__
 #define HAVE_STRINGS_H 1
+#endif
 
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1

diff --git a/backends/platform/libretro/libretro-common/file/retro_dirent.c b/backends/platform/libretro/libretro-common/file/retro_dirent.c
@@ -49,7 +49,7 @@
 #  include <unistd.h>
 #endif
 
-#ifdef __CELLOS_LV2__
+#if defined(__PS3__) && !defined(__PSL1GHT__)
 #include <cell/cell_fs.h>
 #endif
 
@@ -65,7 +65,7 @@ struct RDIR
 #elif defined(VITA) || defined(PSP)
    SceUID directory;
    SceIoDirent entry;
-#elif defined(__CELLOS_LV2__)
+#elif defined(__PS3__) && !defined(__PSL1GHT__)
    CellFsErrno error;
    int directory;
    CellFsDirent entry;
@@ -90,7 +90,7 @@ struct RDIR *retro_opendir(const char *name)
    rdir->directory = FindFirstFile(path_buf, &rdir->entry);
 #elif defined(VITA) || defined(PSP)
    rdir->directory = sceIoDopen(name);
-#elif defined(__CELLOS_LV2__)
+#elif defined(__PS3__) && !defined(__PSL1GHT__)
    rdir->error = cellFsOpendir(name, &rdir->directory);
 #else
    rdir->directory = opendir(name);
@@ -107,7 +107,7 @@ bool retro_dirent_error(struct RDIR *rdir)
    return (rdir->directory == INVALID_HANDLE_VALUE);
 #elif defined(VITA) || defined(PSP)
    return (rdir->directory < 0);
-#elif defined(__CELLOS_LV2__)
+#elif defined(__PS3__) && !defined(__PSL1GHT__)
    return (rdir->error != CELL_FS_SUCCEEDED);
 #else
    return !(rdir->directory);
@@ -120,7 +120,7 @@ int retro_readdir(struct RDIR *rdir)
    return (FindNextFile(rdir->directory, &rdir->entry) != 0);
 #elif defined(VITA) || defined(PSP)
    return (sceIoDread(rdir->directory, &rdir->entry) > 0);
-#elif defined(__CELLOS_LV2__)
+#elif defined(__PS3__) && !defined(__PSL1GHT__)
    uint64_t nread;
    rdir->error = cellFsReaddir(rdir->directory, &rdir->entry, &nread);
    return (nread != 0);
@@ -133,7 +133,7 @@ const char *retro_dirent_get_name(struct RDIR *rdir)
 {
 #if defined(_WIN32)
    return rdir->entry.cFileName;
-#elif defined(VITA) || defined(PSP) || defined(__CELLOS_LV2__)
+#elif defined(VITA) || defined(PSP) || defined(__PS3__)
    return rdir->entry.d_name;
 #else
    return rdir->entry->d_name;
@@ -163,7 +163,7 @@ bool retro_dirent_is_dir(struct RDIR *rdir, const char *path)
 #elif defined(VITA)
    return PSP2_S_ISDIR(entry->d_stat.st_mode);
 #endif
-#elif defined(__CELLOS_LV2__)
+#elif defined(__PS3__) && !defined(__PSL1GHT__)
    CellFsDirent *entry = (CellFsDirent*)&rdir->entry;
    return (entry->d_type == CELL_FS_TYPE_DIRECTORY);
 #elif defined(DT_DIR)
@@ -190,7 +190,7 @@ void retro_closedir(struct RDIR *rdir)
       FindClose(rdir->directory);
 #elif defined(VITA) || defined(PSP)
    sceIoDclose(rdir->directory);
-#elif defined(__CELLOS_LV2__)
+#elif defined(__PS3__) && !defined(__PSL1GHT__)
    rdir->error = cellFsClosedir(rdir->directory);
 #else
    if (rdir->directory)

diff --git a/backends/platform/libretro/libretro-common/file/retro_stat.c b/backends/platform/libretro/libretro-common/file/retro_stat.c
@@ -57,15 +57,15 @@
 #include <kernel/image.h>
 #endif
 
-#if defined(__CELLOS_LV2__)
+#if defined(__PS3__) && !defined(__PSL1GHT__)
 #include <cell/cell_fs.h>
 #endif
 
 #if defined(VITA)
 #define FIO_S_ISDIR PSP2_S_ISDIR
 #endif
 
-#if (defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)) || defined(__QNX__) || defined(PSP)
+#if (defined(__PS3__) && !defined(__PSL1GHT__)) || defined(__QNX__) || defined(PSP)
 #include <unistd.h> /* stat() is defined here */
 #endif
 
@@ -95,7 +95,7 @@ static bool path_stat(const char *path, enum stat_mode mode, int32_t *size)
    }
    free(tmp);
 
-#elif defined(__CELLOS_LV2__)
+#elif defined(__PS3__) && !defined(__PSL1GHT__)
     CellFsStat buf;
     if (cellFsStat(path, &buf) < 0)
        return false;
@@ -124,15 +124,15 @@ static bool path_stat(const char *path, enum stat_mode mode, int32_t *size)
       case IS_DIRECTORY:
 #if defined(VITA) || defined(PSP)
          return FIO_S_ISDIR(buf.st_mode);
-#elif defined(__CELLOS_LV2__)
+#elif defined(__PS3__) && !defined(__PSL1GHT__)
          return ((buf.st_mode & S_IFMT) == S_IFDIR);
 #elif defined(_WIN32)
          return (file_info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
 #else
          return S_ISDIR(buf.st_mode);
 #endif
       case IS_CHARACTER_SPECIAL:
-#if defined(VITA) || defined(PSP) || defined(__CELLOS_LV2__) || defined(_WIN32)
+#if defined(VITA) || defined(PSP) || defined(__PS3__) || defined(_WIN32)
          return false;
 #else
          return S_ISCHR(buf.st_mode);
@@ -144,7 +144,7 @@ static bool path_stat(const char *path, enum stat_mode mode, int32_t *size)
    return false;
 }
 
-#if !defined(WIIU) && !defined(_3DS)
+#if !defined(WIIU) && !defined(_3DS) && !defined(__PS3__)
 /**
  * path_is_directory:
  * @path               : path

diff --git a/backends/platform/libretro/libretro-common/include/retro_miscellaneous.h b/backends/platform/libretro/libretro-common/include/retro_miscellaneous.h
@@ -26,8 +26,10 @@
 #include <stdint.h>
 #include <math.h>
 
-#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
+#if defined(__PS3__) && !defined(__PSL1GHT__)
 #include <sys/timer.h>
+#define fseeko fseek
+#define ftello ftell
 #elif defined(XENON)
 #include <time/time.h>
 #elif(defined(GEKKO) && !defined(WIIU)) || defined(__PSL1GHT__) || defined(__QNX__)
@@ -92,7 +94,7 @@
  **/
 static INLINE void retro_sleep(unsigned msec)
 {
-#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
+#if defined(__PS3__) && !defined(__PSL1GHT__)
    sys_timer_usleep(1000 * msec);
 #elif defined(PSP) || defined(VITA)
    sceKernelDelayThread(1000 * msec);

diff --git a/backends/platform/libretro/libretro.cpp b/backends/platform/libretro/libretro.cpp
@@ -12,7 +12,7 @@
 #else
 #include <unistd.h>
 #endif
-#ifndef _MSC_VER
+#if !defined(_MSC_VER) && !defined(__PS3__)
 /**
  * Include libgen.h for basename() and dirname().
  * @see http://linux.die.net/man/3/basename
@@ -21,6 +21,23 @@
 #endif
 #include <string.h>
 
+#ifdef __PS3__
+char *dirname (char *path)
+{
+	if (path == NULL) return "/";
+    char loc[512];
+    strcpy(loc, path);
+    int l = strlen(loc);
+    loc[l - 1] = 0;
+    if (strrchr(loc, '/') == NULL) return "/";
+    int slash = strrchr(loc, '/') - loc;
+    if (slash == 0) return "/";
+    char* temp = (char*)malloc(slash);
+    memcpy(temp, loc, slash);
+    return temp;
+}
+#endif
+
 /**
  * Include base/internal_version.h to allow access to SCUMMVM_VERSION.
  * @see retro_get_system_info()
@@ -531,7 +548,7 @@ void retro_cheat_set(unsigned unused, bool unused1, const char* unused2) { }
 
 unsigned retro_get_region (void) { return RETRO_REGION_NTSC; }
 
-#if (defined(GEKKO) && !defined(WIIU)) || defined(__CELLOS_LV2__)
+#if (defined(GEKKO) && !defined(WIIU)) || (defined(__PS3__) && !defined(__PSL1GHT__))
 int access(const char *path, int amode)
 {
    FILE *f;

diff --git a/backends/platform/libretro/libretro.h b/backends/platform/libretro/libretro.h
@@ -69,7 +69,7 @@ extern "C" {
 #      endif
 #    endif
 #  else
-#      if defined(__GNUC__) && __GNUC__ >= 4 && !defined(__CELLOS_LV2__)
+#      if defined(__GNUC__) && __GNUC__ >= 4 && !defined(__PS3__)
 #        define RETRO_API RETRO_CALLCONV __attribute__((__visibility__("default")))
 #      else
 #        define RETRO_API RETRO_CALLCONV

diff --git a/backends/platform/libretro/libretro_os.cpp b/backends/platform/libretro/libretro_os.cpp
@@ -53,8 +53,9 @@
 #else
 #include <windows.h>
 #endif
-#elif defined(__CELLOS_LV2__)
+#elif defined(__PS3__) && !defined(__PSL1GHT__)
 #include <sys/sys_time.h>
+#define usleep sys_timer_usleep
 #elif (defined(GEKKO) && !defined(WIIU))
 #include <ogc/lwp_watchdog.h>
 #else
@@ -642,7 +643,7 @@ class OSystem_RETRO : public EventsBaseBackend, public PaletteManager {
          return (ticks_to_microsecs(gettime()) / 1000.0) - _startTime;
 #elif defined(WIIU)
          return ((cpu_features_get_time_usec())/1000) - _startTime;
-#elif defined(__CELLOS_LV2__)
+#elif defined(__PS3__) && !defined(__PSL1GHT__)
          return (sys_time_get_system_time() / 1000.0) - _startTime;
 #else
          struct timeval t;

diff --git a/backends/platform/libretro/os.h b/backends/platform/libretro/os.h
@@ -45,7 +45,7 @@
 extern char cmd_params[20][200];
 extern char cmd_params_num;
 
-#if (defined(GEKKO) && !defined(WIIU)) || defined(__CELLOS_LV2__)
+#if (defined(GEKKO) && !defined(WIIU)) || (defined(__PS3__) && !defined(__PSL1GHT__))
 extern int access(const char *path, int amode);
 #endif
 

diff --git a/common/scummsys.h b/common/scummsys.h
@@ -277,7 +277,7 @@
 		  defined(__SYMBIAN32__) || \
 		  defined(__LIBRETRO__)
 
-#if defined(WIIU) || defined(__CELLOS_LV2__) || defined(GEKKO)
+#if defined(WIIU) || defined(__PS3__) || defined(GEKKO)
 		#undef  SCUMM_LITTLE_ENDIAN
 		#define SCUMM_BIG_ENDIAN
 		#define SCUMM_NEED_ALIGNMENT

diff --git a/engines/bladerunner/ui/vk.cpp b/engines/bladerunner/ui/vk.cpp
@@ -751,7 +751,11 @@ void VK::drawNeedle(Graphics::Surface &surface) {
 	}
 
 	int needleOffset = abs(38 - _needleValue);
+#ifndef __PS3__
 	int y = 345 - sqrt(72 * 72 - needleOffset * needleOffset);
+#else
+	int y = 345 - sqrt((double)72 * 72 - needleOffset * needleOffset);
+#endif
 
 	float colorIntensity = MIN(78.0f, _needleValue + 39.0f) / 78.0f;
 
@@ -935,7 +939,11 @@ void VK::animateAdjustment(int target) {
 void VK::setAdjustment(int x) {
 	_adjustment = CLIP(x - 4, 154, 246);
 	int offset = abs(199 - _adjustment);
+#ifndef __PS3__
 	int y = sqrt(88 * 88 - offset * offset);
+#else
+	int y = sqrt((double)88 * 88 - offset * offset);
+#endif
 	_buttons->setImageLeft(1, _adjustment);
 	_buttons->setImageTop(1, 345 - y);
 }