[Scummvm-git-logs] scummvm master -> f9e91aa873ced24f5dbb5a797bbb414764a0a693

[spleen1981]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f9e91aa873 LIBRETRO: BUILD: add ps3 to gitlab CI/CD


Commit: f9e91aa873ced24f5dbb5a797bbb414764a0a693
    https://github.com/scummvm/scummvm/commit/f9e91aa873ced24f5dbb5a797bbb414764a0a693
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2023-10-02T10:21:08+02:00

Commit Message:
LIBRETRO: BUILD: add ps3 to gitlab CI/CD

Changed paths:
    backends/platform/libretro/.gitlab-ci.yml
    backends/platform/libretro/Makefile
    backends/platform/libretro/include/libretro-fs.h
    backends/platform/libretro/src/libretro-fs-factory.cpp


diff --git a/backends/platform/libretro/.gitlab-ci.yml b/backends/platform/libretro/.gitlab-ci.yml
index 8be83ddaa8c..9ed1e632e7f 100644
--- a/backends/platform/libretro/.gitlab-ci.yml
+++ b/backends/platform/libretro/.gitlab-ci.yml
@@ -84,6 +84,10 @@ include:
   - project: 'libretro-infrastructure/ci-templates'
     file: '/vita-static.yml'
 
+    # PlayStation3
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/psl1ght-static.yml'
+
   # tvOS (AppleTV)
   - project: 'libretro-infrastructure/ci-templates'
     file: '/tvos-arm64.yml'
@@ -239,6 +243,12 @@ libretro-build-vita:
     - .libretro-vita-static-retroarch-master
     - .core-defs
 
+# PlayStation3
+libretro-build-psl1ght:
+  extends:
+    - .libretro-psl1ght-static-retroarch-master
+    - .core-defs
+
 # Miyoo
 libretro-build-miyoo-arm32:
   extends:
diff --git a/backends/platform/libretro/Makefile b/backends/platform/libretro/Makefile
index d23647d8ca9..f8529fdfeb3 100644
--- a/backends/platform/libretro/Makefile
+++ b/backends/platform/libretro/Makefile
@@ -117,14 +117,17 @@ else ifeq ($(platform), genode)
    AR  = $(shell pkg-config genode-base --variable=ar) rcs
    RANLIB = genode-x86-ranlib
 
-# PS3
-else ifeq ($(platform), ps3)
-   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
+# Lightweight PS3 Homebrew SDK
+else ifneq (,$(filter $(platform), ps3 psl1ght))
+   TARGET := $(TARGET_NAME)_libretro_$(platform).a
+   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
+   DEFINES := -DPLAYSTATION3 -D__PS3__ -DRETRO_IS_BIG_ENDIAN=1 -DRETRO_IS_LITTLE_ENDIAN=0 -DWORDS_BIGENDIAN=1 -mcpu=cell -mno-fp-in-toc -I$(PS3DEV)/ppu/include
+   ifeq ($(platform), psl1ght)
+      DEFINES += -D__PSL1GHT__
+   endif
+   STATIC_LINKING = 1
 
 # Nintendo Wii
 else ifeq ($(platform), wii)
diff --git a/backends/platform/libretro/include/libretro-fs.h b/backends/platform/libretro/include/libretro-fs.h
index dfcacdca90c..38941c8e768 100644
--- a/backends/platform/libretro/include/libretro-fs.h
+++ b/backends/platform/libretro/include/libretro-fs.h
@@ -29,32 +29,6 @@
 #endif
 #include <unistd.h>
 
-#ifdef PLAYSTATION3
-#define FORBIDDEN_SYMBOL_ALLOW_ALL
-#define F_OK 0    /* test for existence of file */
-#define W_OK 0x02 /* test for write permission */
-#define R_OK 0x04 /* test for read permission */
-
-#ifndef S_ISDIR
-#define S_ISDIR(x) (x & 0040000)
-#endif
-
-static inline int access(const char *pn, int mode) {
-	warning("access: pn %s\n", pn);
-	int fd = open(pn, O_RDONLY);
-	if (fd < 0)
-		return -1;
-
-	// XXX lie about it, for now..
-	close(fd);
-	return 0;
-}
-
-static inline char *getenv(const char *name) {
-	return 0;
-}
-#endif
-
 /**
  * Implementation of the ScummVM file system API based on LibRetro.
  *
diff --git a/backends/platform/libretro/src/libretro-fs-factory.cpp b/backends/platform/libretro/src/libretro-fs-factory.cpp
index ab4a6a72266..d123a03dcfc 100644
--- a/backends/platform/libretro/src/libretro-fs-factory.cpp
+++ b/backends/platform/libretro/src/libretro-fs-factory.cpp
@@ -27,25 +27,6 @@
 #define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h
 #define FORBIDDEN_SYMBOL_EXCEPTION_mkdir
 #define FORBIDDEN_SYMBOL_EXCEPTION_exit // Needed for IRIX's unistd.h
-#ifdef PLAYSTATION3
-#include <stdlib.h>
-#include <string.h>
-#define FORBIDDEN_SYMBOL_ALLOW_ALL
-
-extern char *getwd(char *);
-extern int errno;
-
-#ifndef PATH_MAX
-#define PATH_MAX 1024
-#endif
-
-#define ERANGE 34 // Result too large
-#define ENOMEM 12 // Cannot allocate memory
-
-static inline char *getcwd(char *buf, size_t len) {
-	return 0;
-}
-#endif
 
 #include "backends/platform/libretro/include/libretro-fs-factory.h"
 #include "backends/platform/libretro/include/libretro-fs.h"