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

[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:
efa6ac88b2 LIBRETRO: BUILD: fix emscripten AR


Commit: efa6ac88b2b57ee6083c6f46ec3e4cbf1dfa0688
    https://github.com/scummvm/scummvm/commit/efa6ac88b2b57ee6083c6f46ec3e4cbf1dfa0688
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2023-10-02T21:22:04+02:00

Commit Message:
LIBRETRO: BUILD: fix emscripten AR

Changed paths:
    backends/platform/libretro/Makefile


diff --git a/backends/platform/libretro/Makefile b/backends/platform/libretro/Makefile
index f8529fdfeb3..b398526ddd7 100644
--- a/backends/platform/libretro/Makefile
+++ b/backends/platform/libretro/Makefile
@@ -27,12 +27,14 @@ endif
 TARGET_64BIT := $(BUILD_64BIT)
 
 LD        = $(CXX)
-AR        = ar cru
-RANLIB    = ranlib
-LS        = ls
-MKDIR     = mkdir -p
-RM        = rm -f
-RM_REC    = rm -rf
+AR       := ar cru
+RANLIB   := ranlib
+LS       := ls
+MKDIR    := mkdir -p
+RM       := rm -f
+RM_REC   := rm -rf
+CP       := cp
+
 
 LDFLAGS :=
 
@@ -165,7 +167,6 @@ else ifeq ($(platform), wiiu)
    DEFINES += -DHAVE_STRTOUL -DWIIU
    CXXFLAGS := -fpermissive
    LITE := 1
-   CP := cp
    STATIC_LINKING = 1
 
 # Nintendo 3DS
@@ -304,9 +305,12 @@ else ifneq (,$(findstring oga_a35_neon_hardfloat,$(platform)))
 # Emscripten
 else ifeq ($(platform), emscripten)
    TARGET := $(TARGET_NAME)_libretro_$(platform).bc
+   AR_ALONE := emar
+   AR := emar rcs
    DEFINES += -DEMSCRIPTEN -DUSE_CXX11
    CXXFLAGS += -std=c++11
    STATIC_LINKING = 1
+   USE_LIBCO  = 0
    USE_CLOUD = 0
 
 # Windows MSVC 2017 all architectures
@@ -565,7 +569,7 @@ else
 endif
 endif
 
-ifeq ($(platform), wiiu)
+ifneq (,$(filter $(platform), wiiu emscripten))
 $(TARGET): $(OBJS) libdeps.a libdetect.a
 	$(MKDIR) libtemp
 	$(CP) $+ libtemp/
@@ -578,7 +582,7 @@ $(TARGET): libnx-ln $(OBJS) libdeps.a libdetect.a
 else ifeq ($(STATIC_LINKING), 1)
 $(TARGET): $(OBJS) libdeps.a libdetect.a
 	$(MKDIR) libtemp
-	cp $+ libtemp/
+	$(CP) $+ libtemp/
 	@echo Linking $@...
 	$(AR) -M < $(ROOT_PATH)/script.mri
 else