Merge remote-tracking branch 'upstream/master'

DrUm78 · Jun 9, 2023 · 87add15 · 87add15
2 parents ad99f9a + 6ec8549
commit 87add15
Show file tree

Hide file tree

Showing 26 changed files with 2,407 additions and 1,656 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -63,10 +63,14 @@ include:
     file: '/ios9.yml'
 
   ################################## CONSOLES ################################
-  # PlayStation 2
+  # PlayStation2
   - project: 'libretro-infrastructure/ci-templates'
     file: '/ps2-static.yml'
 
+  # PlayStation3
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/psl1ght-static.yml'
+
   # PlayStation Portable
   - project: 'libretro-infrastructure/ci-templates'
     file: '/psp-static.yml'
@@ -221,12 +225,18 @@ libretro-build-tvos-arm64:
     - .core-defs
 
 ################################### CONSOLES #################################
-# PlayStation 2
+# PlayStation2
 libretro-build-ps2:
   extends:
     - .libretro-ps2-static-retroarch-master
     - .core-defs
 
+# PlayStation3
+libretro-build-psl1ght:
+  extends:
+    - .libretro-psl1ght-static-retroarch-master
+    - .core-defs
+
 # PlayStation Portable
 libretro-build-psp:
   extends:

diff --git a/Makefile b/Makefile
@@ -134,6 +134,8 @@ else ifeq ($(platform), tvos-arm64)
 ifeq ($(IOSSDK),)
    IOSSDK := $(shell xcodebuild -version -sdk appletvos Path)
 endif
+   CC = clang -arch arm64 -isysroot $(IOSSDK)
+   CXX = clang++ -arch arm64 -isysroot $(IOSSDK)
 
 else ifeq ($(platform), theos_ios)
 	# Theos iOS
@@ -230,7 +232,7 @@ else ifneq (,$(filter $(platform), ps3 psl1ght))
 	CFLAGS += -D__PS3__
 	STATIC_LINKING = 1
 	ifeq ($(platform), psl1ght)
-		PLATFORM_DEFINES += -D__PSL1GHT__
+		PLATFORM_DEFINES += -D__PSL1GHT__ -DHAVE_STRLWR -I$(PS3DEV)/ppu/include
 	endif
 
 # PS2
@@ -670,7 +672,7 @@ WARNINGS_DEFINES = -Wall -W -Wno-unused-parameter
 CODE_DEFINES = -fomit-frame-pointer
 endif
 
-COMMON_DEFINES += $(CODE_DEFINES) $(WARNINGS_DEFINES) $(fpic) $(INCFLAGS) $(INCFLAGS_PLATFORM)
+COMMON_DEFINES += $(CODE_DEFINES) $(PLATFORM_DEFINES) $(WARNINGS_DEFINES) $(fpic) $(INCFLAGS) $(INCFLAGS_PLATFORM)
 
 CFLAGS     += $(DEFINES) $(COMMON_DEFINES)
 

diff --git a/libretro/libretro-common/compat/compat_strl.c b/libretro/libretro-common/compat/compat_strl.c
@@ -60,10 +60,3 @@ size_t strlcat(char *dest, const char *source, size_t size)
    return len + strlcpy(dest, source, size);
 }
 #endif
-
-char *strldup(const char *s, size_t n)
-{
-   char *dst = (char*)malloc(sizeof(char) * (n + 1));
-   strlcpy(dst, s, n);
-   return dst;
-}
diff --git a/libretro/libretro-common/compat/fopen_utf8.c b/libretro/libretro-common/compat/fopen_utf8.c
@@ -37,27 +37,28 @@
 void *fopen_utf8(const char * filename, const char * mode)
 {
 #if defined(LEGACY_WIN32)
-   FILE             *ret = NULL;
    char * filename_local = utf8_to_local_string_alloc(filename);
-
-   if (!filename_local)
-      return NULL;
-   ret = fopen(filename_local, mode);
    if (filename_local)
+   {
+      FILE *ret          = fopen(filename_local, mode);
       free(filename_local);
-   return ret;
+      return ret;
+   }
 #else
-   wchar_t * filename_w = utf8_to_utf16_string_alloc(filename);
-   wchar_t * mode_w = utf8_to_utf16_string_alloc(mode);
-   FILE* ret = NULL;
-
-   if (filename_w && mode_w)
-      ret = _wfopen(filename_w, mode_w);
+   wchar_t * filename_w  = utf8_to_utf16_string_alloc(filename);
    if (filename_w)
+   {
+      FILE    *ret       = NULL;
+      wchar_t *mode_w    = utf8_to_utf16_string_alloc(mode);
+      if (mode_w)
+      {
+         ret             = _wfopen(filename_w, mode_w);
+         free(mode_w);
+      }
       free(filename_w);
-   if (mode_w)
-      free(mode_w);
-   return ret;
+      return ret;
+   }
 #endif
+   return NULL;
 }
 #endif