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

[spleen1981]

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

Summary:
4cfd17aaf4 LIBRETRO: BUILD: add wii to gitlab CI/CD
d1f15b9fd7 LIBRETRO: BUILD: add emscripten to gitlab CI/CD


Commit: 4cfd17aaf4454cc558d6a51b88354a146853d27f
    https://github.com/scummvm/scummvm/commit/4cfd17aaf4454cc558d6a51b88354a146853d27f
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2023-10-01T15:24:47+02:00

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

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 bf024568545..ae7ccd3519d 100644
--- a/backends/platform/libretro/.gitlab-ci.yml
+++ b/backends/platform/libretro/.gitlab-ci.yml
@@ -56,6 +56,10 @@ include:
     file: '/ios9.yml'
     
   ################################## CONSOLES ################################
+    # Nintendo Wii
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/wii-static.yml'
+
   # Nintendo WiiU
   - project: 'libretro-infrastructure/ci-templates'
     file: '/wiiu-static.yml'
@@ -190,6 +194,12 @@ libretro-build-tvos-arm64:
     - .core-defs
 
 ################################### CONSOLES #################################
+# Nintendo Wii
+libretro-build-wii:
+  extends:
+    - .libretro-wii-static-retroarch-master
+    - .core-defs
+
 # Nintendo WiiU
 libretro-build-wiiu:
   extends:
diff --git a/backends/platform/libretro/Makefile b/backends/platform/libretro/Makefile
index 3693e27c208..c9d996d877d 100644
--- a/backends/platform/libretro/Makefile
+++ b/backends/platform/libretro/Makefile
@@ -132,8 +132,9 @@ else ifeq ($(platform), wii)
    CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
    CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
    AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT) rcs
-   DEFINES += -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float -D__ppc__ -I$(DEVKITPRO)/libogc/include -DDEFAULT_PERF_TUNER
-   STATIC_LINKING=1
+   DEFINES += -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float -D__ppc__ -I$(DEVKITPRO)/libogc/include -DDEFAULT_PERF_TUNER -DRETRO_IS_BIG_ENDIAN=1 -DRETRO_IS_LITTLE_ENDIAN=0 -DWORDS_BIGENDIAN=1
+   LITE := 1
+   STATIC_LINKING = 1
 
 # Nintendo Switch (libnx)
 else ifeq ($(platform), libnx)


Commit: d1f15b9fd706498e22c11c5e3669cf0603e026c2
    https://github.com/scummvm/scummvm/commit/d1f15b9fd706498e22c11c5e3669cf0603e026c2
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2023-10-01T15:25:00+02:00

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

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 ae7ccd3519d..8be83ddaa8c 100644
--- a/backends/platform/libretro/.gitlab-ci.yml
+++ b/backends/platform/libretro/.gitlab-ci.yml
@@ -89,6 +89,9 @@ include:
     file: '/tvos-arm64.yml'
 
   #################################### MISC ##################################
+  # Emscripten
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/emscripten-static.yml'
 
 # Stages for building
 stages:
@@ -241,3 +244,10 @@ libretro-build-miyoo-arm32:
   extends:
     - .libretro-miyoo-arm32-make-default
     - .core-defs
+
+#################################### MISC ##################################
+# Emscripten
+libretro-build-emscripten:
+  extends:
+    - .libretro-emscripten-static-retroarch-master
+    - .core-defs
diff --git a/backends/platform/libretro/Makefile b/backends/platform/libretro/Makefile
index c9d996d877d..d23647d8ca9 100644
--- a/backends/platform/libretro/Makefile
+++ b/backends/platform/libretro/Makefile
@@ -301,6 +301,8 @@ else ifneq (,$(findstring oga_a35_neon_hardfloat,$(platform)))
 # Emscripten
 else ifeq ($(platform), emscripten)
    TARGET := $(TARGET_NAME)_libretro_$(platform).bc
+   DEFINES += -DEMSCRIPTEN -DUSE_CXX11
+   CXXFLAGS += -std=c++11
    STATIC_LINKING = 1
    USE_CLOUD = 0