[Scummvm-git-logs] scummvm master -> 0660b909439e39800075f5f3521b26e0fc3a7d45

[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:
0660b90943 LIBRETRO: BUILD: Add psvita to gitlab-ci and build fix


Commit: 0660b909439e39800075f5f3521b26e0fc3a7d45
    https://github.com/scummvm/scummvm/commit/0660b909439e39800075f5f3521b26e0fc3a7d45
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2023-03-07T21:15:49+01:00

Commit Message:
LIBRETRO: BUILD: Add psvita to gitlab-ci and build fix

Changed paths:
    backends/platform/libretro/.gitlab-ci.yml
    backends/platform/libretro/Makefile


diff --git a/backends/platform/libretro/.gitlab-ci.yml b/backends/platform/libretro/.gitlab-ci.yml
index c01ba20bc6a..bf024568545 100644
--- a/backends/platform/libretro/.gitlab-ci.yml
+++ b/backends/platform/libretro/.gitlab-ci.yml
@@ -76,6 +76,10 @@ include:
   - project: 'libretro-infrastructure/ci-templates'
     file: '/dingux-arm32.yml'
 
+  # PlayStation Vita
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/vita-static.yml'
+
   # tvOS (AppleTV)
   - project: 'libretro-infrastructure/ci-templates'
     file: '/tvos-arm64.yml'
@@ -216,6 +220,12 @@ libretro-build-dingux-odbeta-mips32:
     - .libretro-dingux-odbeta-mips32-make-default
     - .core-defs
 
+# PlayStation Vita
+libretro-build-vita:
+  extends:
+    - .libretro-vita-static-retroarch-master
+    - .core-defs
+
 # Miyoo
 libretro-build-miyoo-arm32:
   extends:
diff --git a/backends/platform/libretro/Makefile b/backends/platform/libretro/Makefile
index 7b760d27ec1..23027fdfde0 100644
--- a/backends/platform/libretro/Makefile
+++ b/backends/platform/libretro/Makefile
@@ -570,15 +570,12 @@ $(TARGET): libnx-ln $(OBJS) libdeps.a libdetect.a
 	$(MKDIR) libtemp
 	cp $+ libtemp/
 	$(AR) -M < $(ROOT_PATH)/script.mri
-else ifeq ($(platform), ctr)
+else ifeq ($(STATIC_LINKING), 1)
 $(TARGET): $(OBJS) libdeps.a libdetect.a
 	$(MKDIR) libtemp
 	cp $+ libtemp/
-	$(AR) -M < $(ROOT_PATH)/script.mri
-else ifeq ($(STATIC_LINKING), 1)
-$(TARGET): $(DETECT_OBJS) $(OBJS) libdeps.a libdetect.a
 	@echo Linking $@...
-	$(HIDE)$(AR) $@ $(wildcard *.o) $(wildcard */*.o) $(wildcard */*/*.o) $(wildcard */*/*/*.o) $(wildcard */*/*/*/*.o)  $(wildcard */*/*/*/*/*.o)
+	$(AR) -M < $(ROOT_PATH)/script.mri
 else
 $(TARGET): $(DETECT_OBJS) $(OBJS) libdeps.a
 	@echo Linking $@...