From 76cb71464de9e6efd7de06ea6180a17b3b863b2a Mon Sep 17 00:00:00 2001
From: saulfabreg Wii VC Project <saulfabregamboa@outlook.com>
Date: Fri, 18 Aug 2023 15:53:43 -0500
Subject: [PATCH] Fix GameCube builds for VBA-M Libretro too

The GameCube, like the Wii and Wii U, is also big-endian, so let's fix VBA-M for GCN too.
---
 .gitlab-ci.yml        | 10 ++++++++++
 src/libretro/Makefile |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8370ccd2..2e64b946 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -57,6 +57,10 @@ include:
   - project: 'libretro-infrastructure/ci-templates'
     file: '/vita-static.yml'
 
+  # Nintendo GameCube
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/ngc-static.yml'
+
   # Nintendo Wii
   - project: 'libretro-infrastructure/ci-templates'
     file: '/wii-static.yml'
@@ -172,6 +176,12 @@ libretro-build-vita:
     - .libretro-vita-static-retroarch-master
     - .core-defs
     
+# Nintendo GameCube
+libretro-build-ngc:
+  extends:
+    - .libretro-ngc-static-retroarch-master
+    - .core-defs
+
 # Nintendo Wii
 libretro-build-wii:
   extends:
diff --git a/src/libretro/Makefile b/src/libretro/Makefile
index 9dc70b52..03a8db20 100644
--- a/src/libretro/Makefile
+++ b/src/libretro/Makefile
@@ -286,7 +286,7 @@ else ifeq ($(platform), ngc)
 	CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
 	CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
 	AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
-	ENDIANNESS_DEFINES += -DMSB_FIRST
+	ENDIANNESS_DEFINES += -DMSB_FIRST -DWORDS_BIGENDIAN=1
 	PLATFORM_DEFINES += -DGEKKO -DHW_DOL -mrvl -mcpu=750 -meabi -mhard-float -D__ppc__
 	PLATFORM_DEFINES += -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int
 	STATIC_LINKING=1