From 16b2358bf6d0eb69d38f09d780ab770607fba8fa Mon Sep 17 00:00:00 2001
From: Twinaphex <autechre1024@hotmail.com>
Date: Sat, 1 Sep 2012 03:01:33 +0200
Subject: [PATCH] (GX) Wii now takes in libretro_wii.a, Cube takes in
 libretro_ngc.a - DOL/ELF binary output filenames changed - split up code

---
 Makefile.gc => Makefile.ngc                      |  10 +++++-----
 ...file.gc.salamander => Makefile.ngc.salamander |   2 +-
 Makefile.wii                                     |   6 +++---
 Makefile.wii.salamander                          |   6 +++---
 console/griffin/griffin.c                        |   4 ++--
 {gx => wii}/mem2_manager.c                       |   0
 {gx => wii}/mem2_manager.h                       |   0
 wii/pkg/icon.png                                 | Bin 0 -> 7421 bytes
 wii/pkg/meta.xml                                 |  10 ++++++++++
 {gx => wii}/vi_encoder.c                         |   0
 {gx => wii}/vi_encoder.h                         |   0
 11 files changed, 24 insertions(+), 14 deletions(-)
 rename Makefile.gc => Makefile.ngc (92%)
 rename Makefile.gc.salamander => Makefile.ngc.salamander (98%)
 rename {gx => wii}/mem2_manager.c (100%)
 rename {gx => wii}/mem2_manager.h (100%)
 create mode 100644 wii/pkg/icon.png
 create mode 100644 wii/pkg/meta.xml
 rename {gx => wii}/vi_encoder.c (100%)
 rename {gx => wii}/vi_encoder.h (100%)

diff --git a/Makefile.gc b/Makefile.ngc
similarity index 92%
rename from Makefile.gc
rename to Makefile.ngc
index 3af7276a97..6ff703f71b 100644
--- a/Makefile.gc
+++ b/Makefile.ngc
@@ -26,8 +26,8 @@ CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
 LD = $(DEVKITPPC)/bin/powerpc-eabi-ld$(EXE_EXT)
 ELF2DOL = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT)
 
-DOL_TARGET := retroarch_gx_gc.dol
-ELF_TARGET := retroarch_gx_gc.elf
+DOL_TARGET := retroarch_ngc.dol
+ELF_TARGET := retroarch_ngc.elf
 
 INCLUDE := -I. -I$(DEVKITPRO)/libogc/include
 LIBDIRS := -L$(DEVKITPRO)/libogc/lib/cube -L.
@@ -35,7 +35,7 @@ LIBDIRS := -L$(DEVKITPRO)/libogc/lib/cube -L.
 MACHDEP := -DGEKKO -DHW_DOL -mogc -mcpu=750 -meabi -mhard-float
 CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map -T gx/ld/ogc.ld
-LIBS := -lfat -lretro_wii -logc
+LIBS := -lfat -logc
 
 APP_BOOTER_DIR = gx/app_booter
 
@@ -80,7 +80,7 @@ $(ELF_TARGET): $(OBJ)
 	$(LD) -r -b binary -o $@ $<
 
 $(APP_BOOTER_DIR)/app_booter_gc.bin:
-	$(MAKE) -C $(APP_BOOTER_DIR) platform=gc
+	$(MAKE) -C $(APP_BOOTER_DIR) platform=ngc
 
 pkg: all
 	cp -r $(DOL_TARGET) gx/pkg/CORE.dol
@@ -89,7 +89,7 @@ clean:
 	rm -f $(DOL_TARGET)
 	rm -f $(ELF_TARGET)
 	rm -f $(OBJ)
-	$(MAKE) -C $(APP_BOOTER_DIR) platform=gc clean
+	$(MAKE) -C $(APP_BOOTER_DIR) platform=ngc clean
 
 .PHONY: clean
 
diff --git a/Makefile.gc.salamander b/Makefile.ngc.salamander
similarity index 98%
rename from Makefile.gc.salamander
rename to Makefile.ngc.salamander
index 363449ad92..b5c51c9251 100644
--- a/Makefile.gc.salamander
+++ b/Makefile.ngc.salamander
@@ -35,7 +35,7 @@ LIBDIRS := -L$(DEVKITPRO)/libogc/lib/cube -L.
 MACHDEP := -DGEKKO -DHW_DOL -mogc -mcpu=750 -meabi -mhard-float
 CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map
-LIBS := -lfat -lretro_wii -logc
+LIBS := -lfat -lretro_ngc -logc
 
 APP_BOOTER_DIR = gx/app_booter
 
diff --git a/Makefile.wii b/Makefile.wii
index 3c92569158..c2b6ab354c 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -26,8 +26,8 @@ CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
 LD = $(DEVKITPPC)/bin/powerpc-eabi-ld$(EXE_EXT)
 ELF2DOL = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT)
 
-DOL_TARGET := retroarch_gx.dol
-ELF_TARGET := retroarch_gx.elf
+DOL_TARGET := retroarch_wii.dol
+ELF_TARGET := retroarch_wii.elf
 
 INCLUDE := -I. -I$(DEVKITPRO)/libogc/include
 LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L.
@@ -82,7 +82,7 @@ $(APP_BOOTER_DIR)/app_booter_wii.bin:
 	$(MAKE) -C $(APP_BOOTER_DIR) platform=wii
 
 pkg: all
-	cp -r $(DOL_TARGET) gx/pkg/CORE.dol
+	cp -r $(DOL_TARGET) wii/pkg/CORE.dol
 
 clean:
 	rm -f $(DOL_TARGET)
diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander
index c20c48b9a9..f746807f78 100644
--- a/Makefile.wii.salamander
+++ b/Makefile.wii.salamander
@@ -26,8 +26,8 @@ CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
 LD = $(DEVKITPPC)/bin/powerpc-eabi-ld$(EXE_EXT)
 ELF2DOL = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT)
 
-DOL_TARGET := retroarch-salamander_gx.dol
-ELF_TARGET := retroarch-salamander_gx.elf
+DOL_TARGET := retroarch-salamander_wii.dol
+ELF_TARGET := retroarch-salamander_wii.elf
 
 INCLUDE := -I. -I$(DEVKITPRO)/libogc/include
 LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L.
@@ -35,7 +35,7 @@ LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L.
 MACHDEP := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float
 CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map
-LIBS := -lfat -lretro_wii -lwiiuse -logc -lbte
+LIBS := -lfat -lwiiuse -logc -lbte
 
 APP_BOOTER_DIR = gx/app_booter
 
diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index d325ae58c5..8d33094438 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -128,8 +128,8 @@ VIDEO DRIVER
 #include "../../gfx/gl.c"
 #elif defined(GEKKO)
 #ifdef HW_RVL
-#include "../../gx/vi_encoder.c"
-#include "../../gx/mem2_manager.c"
+#include "../../wii/vi_encoder.c"
+#include "../../wii/mem2_manager.c"
 #endif
 #include "../../gx/gx_video.c"
 #endif
diff --git a/gx/mem2_manager.c b/wii/mem2_manager.c
similarity index 100%
rename from gx/mem2_manager.c
rename to wii/mem2_manager.c
diff --git a/gx/mem2_manager.h b/wii/mem2_manager.h
similarity index 100%
rename from gx/mem2_manager.h
rename to wii/mem2_manager.h
diff --git a/wii/pkg/icon.png b/wii/pkg/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..23d1a0762edcb301d9f6765e836ba495783e9970
GIT binary patch
literal 7421
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

literal 0
HcmV?d00001

diff --git a/wii/pkg/meta.xml b/wii/pkg/meta.xml
new file mode 100644
index 0000000000..0d4b53ce65
--- /dev/null
+++ b/wii/pkg/meta.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<app version="1">
+  <name>RetroArch GX</name>
+  <coder>Maister, Squarepusher, ToadKing</coder>
+  <version>0.9.7.1</version>
+  <release_date>2012</release_date>
+  <short_description>Multi-system emulator</short_description> 
+  <long_description>A port of RetroArch to the GameCube/Wii.</long_description> 
+  <no_ios_reload/>
+</app>
diff --git a/gx/vi_encoder.c b/wii/vi_encoder.c
similarity index 100%
rename from gx/vi_encoder.c
rename to wii/vi_encoder.c
diff --git a/gx/vi_encoder.h b/wii/vi_encoder.h
similarity index 100%
rename from gx/vi_encoder.h
rename to wii/vi_encoder.h