diff --git a/.github/workflows/GameCube.yml b/.github/workflows/GameCube.yml
new file mode 100644
index 0000000000..215bc7b2b9
--- /dev/null
+++ b/.github/workflows/GameCube.yml
@@ -0,0 +1,34 @@
+name: CI GameCube
+
+on:
+  push:
+  pull_request:
+  repository_dispatch:
+    types: [run_build]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container: 
+      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-devkitpro:latest
+      options: --user root
+
+    steps:
+    - uses: actions/checkout@v3
+    
+    - name: Compile RA
+      run: |
+        make -f Makefile.ngc -j$(getconf _NPROCESSORS_ONLN) clean
+        make -f Makefile.ngc -j$(getconf _NPROCESSORS_ONLN) EXTERNAL_LIBOGC=1 GX_PTHREAD_LEGACY=0 HAVE_STATIC_DUMMY=1
+    - name: Get short SHA
+      id: slug
+      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
+    
+    - uses: actions/upload-artifact@v3
+      with:
+        name: RA-GameCube-dummy-${{ steps.slug.outputs.sha8 }}
+        path: |
+          retroarch_ngc.dol
diff --git a/.github/workflows/Wii.yml b/.github/workflows/Wii.yml
new file mode 100644
index 0000000000..dfcfa88379
--- /dev/null
+++ b/.github/workflows/Wii.yml
@@ -0,0 +1,39 @@
+name: CI Wii
+
+on:
+  push:
+  pull_request:
+  repository_dispatch:
+    types: [run_build]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container: 
+      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-devkitpro:latest
+      options: --user root
+
+    steps:
+    - uses: actions/checkout@v3
+    
+    - name: Compile Salamander
+      run: |
+        make -f Makefile.wii.salamander -j$(getconf _NPROCESSORS_ONLN) clean
+        make -f Makefile.wii.salamander -j$(getconf _NPROCESSORS_ONLN) EXTERNAL_LIBOGC=1 GX_PTHREAD_LEGACY=0
+    
+    - name: Compile RA
+      run: |
+        make -f Makefile.wii -j$(getconf _NPROCESSORS_ONLN) clean
+        make -f Makefile.wii -j$(getconf _NPROCESSORS_ONLN) EXTERNAL_LIBOGC=1 GX_PTHREAD_LEGACY=0 HAVE_STATIC_DUMMY=1
+    - name: Get short SHA
+      id: slug
+      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
+    
+    - uses: actions/upload-artifact@v3
+      with:
+        name: RA-Wii-dummy-${{ steps.slug.outputs.sha8 }}
+        path: |
+          retroarch_wii.dol
diff --git a/Makefile.ngc b/Makefile.ngc
index 5f42d7d6e0..d3c9bfa054 100644
--- a/Makefile.ngc
+++ b/Makefile.ngc
@@ -10,6 +10,7 @@ PC_DEVELOPMENT_IP_ADDRESS  = 255.255.255.255
 PC_DEVELOPMENT_UDP_PORT    = 3490
 RARCH_CONSOLE              = 0
 USBGECKO                   = 0
+HAVE_STATIC_DUMMY ?= 0
 
 SPACE      :=
 SPACE      := $(SPACE) $(SPACE)
@@ -44,7 +45,15 @@ ifeq ($(WHOLE_ARCHIVE_LINK), 1)
    WHOLE_END       := -Wl,--no-whole-archive
 endif
 
-LIBS               := $(WHOLE_START) -lretro_ngc $(WHOLE_END)
+LIB_CORE :=
+
+ifeq ($(HAVE_STATIC_DUMMY),1)
+  DEFINES += -DHAVE_STATIC_DUMMY
+else
+  LIB_CORE += -lretro_ngc
+endif
+
+LIBS               := $(WHOLE_START) $(LIB_CORE) $(WHOLE_END)
 
 libogc_platform    := 1
 
diff --git a/Makefile.wii b/Makefile.wii
index 7aa902923c..297b5f7f91 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -12,6 +12,7 @@ PC_DEVELOPMENT_IP_ADDRESS  = 255.255.255.255
 PC_DEVELOPMENT_UDP_PORT    = 3490
 RARCH_CONSOLE              = 0
 USBGECKO                   = 0
+HAVE_STATIC_DUMMY ?= 0
 
 SPACE      :=
 SPACE      := $(SPACE) $(SPACE)
@@ -46,7 +47,15 @@ ifeq ($(WHOLE_ARCHIVE_LINK), 1)
    WHOLE_END       := -Wl,--no-whole-archive
 endif
 
-LIBS               := $(WHOLE_START) -lretro_wii $(WHOLE_END)
+LIB_CORE :=
+
+ifeq ($(HAVE_STATIC_DUMMY),1)
+  DEFINES += -DHAVE_STATIC_DUMMY
+else
+  LIB_CORE += -lretro_wii
+endif
+
+LIBS               := $(WHOLE_START) $(LIB_CORE) $(WHOLE_END)
 
 libogc_platform    := 1