From 46210fce540a26e939c0eb14fc415f6fcc180037 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Tue, 7 Aug 2012 05:24:12 +0200 Subject: [PATCH] (Wii) Rename all Wii files to gx/ --- Makefile.wii | 2 +- Makefile.wii.salamander | 4 ++-- console/griffin/griffin.c | 8 ++++---- {wii => gx}/frontend/main.c | 0 {wii => gx}/gx_audio.c | 0 {wii => gx}/gx_input.c | 0 {wii => gx}/gx_input.h | 0 {wii => gx}/gx_video.c | 2 +- wii/driver.h => gx/gx_video.h | 4 ++-- {wii => gx}/pkg/cores/presets/.empty | 0 {wii => gx}/pkg/cores/presets/input/.empty | 0 {wii => gx}/pkg/cores/savestates/.empty | 0 {wii => gx}/pkg/cores/sram/.empty | 0 {wii => gx}/pkg/cores/system/.empty | 0 {wii => gx}/pkg/icon.png | Bin {wii => gx}/pkg/meta.xml | 4 ++-- {wii => gx}/salamander/main.c | 0 17 files changed, 12 insertions(+), 12 deletions(-) rename {wii => gx}/frontend/main.c (100%) rename {wii => gx}/gx_audio.c (100%) rename {wii => gx}/gx_input.c (100%) rename {wii => gx}/gx_input.h (100%) rename {wii => gx}/gx_video.c (99%) rename wii/driver.h => gx/gx_video.h (95%) rename {wii => gx}/pkg/cores/presets/.empty (100%) rename {wii => gx}/pkg/cores/presets/input/.empty (100%) rename {wii => gx}/pkg/cores/savestates/.empty (100%) rename {wii => gx}/pkg/cores/sram/.empty (100%) rename {wii => gx}/pkg/cores/system/.empty (100%) rename {wii => gx}/pkg/icon.png (100%) rename {wii => gx}/pkg/meta.xml (76%) rename {wii => gx}/salamander/main.c (100%) diff --git a/Makefile.wii b/Makefile.wii index 44208a10c4..5286a768a4 100644 --- a/Makefile.wii +++ b/Makefile.wii @@ -62,7 +62,7 @@ $(ELF_TARGET): $(OBJ) $(LD) -r -b binary -o $@ $< pkg: all - cp -r $(DOL_TARGET) wii/pkg/CORE.dol + cp -r $(DOL_TARGET) gx/pkg/CORE.dol clean: rm -f $(DOL_TARGET) diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander index 48dc20eaf4..8f51129ba3 100644 --- a/Makefile.wii.salamander +++ b/Makefile.wii.salamander @@ -25,7 +25,7 @@ CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE) LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map,--section-start,.init=0x81200000 LIBS := -lfat -lretro_wii -lwiiuse -logc -lbte -OBJ = wii/salamander/main.o console/rarch_console_exec.o console/rarch_console_libretro_mgmt.o file_path.o compat/compat.o conf/config_file.o console/exec/dol.o +OBJ = gx/salamander/main.o console/rarch_console_exec.o console/rarch_console_libretro_mgmt.o file_path.o compat/compat.o conf/config_file.o console/exec/dol.o ifeq ($(HAVE_LOGGER), 1) CFLAGS += -DHAVE_LOGGER @@ -62,7 +62,7 @@ $(ELF_TARGET): $(OBJ) $(LD) -r -b binary -o $@ $< pkg: all - cp -r $(DOL_TARGET) wii/pkg/boot.dol + cp -r $(DOL_TARGET) gx/pkg/boot.dol clean: rm -f $(DOL_TARGET) diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c index 8eb34c3037..23cfd05181 100644 --- a/console/griffin/griffin.c +++ b/console/griffin/griffin.c @@ -127,7 +127,7 @@ VIDEO DRIVER #if defined(HAVE_OPENGL) #include "../../gfx/gl.c" #elif defined(GEKKO) -#include "../../wii/gx_video.c" +#include "../../gx/gx_video.c" #endif #include "../../gfx/gfx_common.c" @@ -161,7 +161,7 @@ INPUT #if defined(__CELLOS_LV2__) #include "../../ps3/ps3_input.c" #elif defined(GEKKO) -#include "../../wii/gx_input.c" +#include "../../gx/gx_input.c" #elif defined(_XBOX) #include "../../xdk/xdk_xinput_input.c" #endif @@ -213,7 +213,7 @@ AUDIO #elif defined(_XBOX360) #include "../../360/xdk360_audio.cpp" #elif defined(GEKKO) -#include "../../wii/gx_audio.c" +#include "../../gx/gx_audio.c" #endif #ifdef HAVE_DSOUND @@ -262,7 +262,7 @@ MAIN #if defined(_XBOX) #include "../../xdk/frontend/main.c" #elif defined(GEKKO) -#include "../../wii/frontend/main.c" +#include "../../gx/frontend/main.c" #endif /*============================================================ diff --git a/wii/frontend/main.c b/gx/frontend/main.c similarity index 100% rename from wii/frontend/main.c rename to gx/frontend/main.c diff --git a/wii/gx_audio.c b/gx/gx_audio.c similarity index 100% rename from wii/gx_audio.c rename to gx/gx_audio.c diff --git a/wii/gx_input.c b/gx/gx_input.c similarity index 100% rename from wii/gx_input.c rename to gx/gx_input.c diff --git a/wii/gx_input.h b/gx/gx_input.h similarity index 100% rename from wii/gx_input.h rename to gx/gx_input.h diff --git a/wii/gx_video.c b/gx/gx_video.c similarity index 99% rename from wii/gx_video.c rename to gx/gx_video.c index 238463fc99..52148b9295 100644 --- a/wii/gx_video.c +++ b/gx/gx_video.c @@ -15,7 +15,7 @@ #include "../driver.h" #include "../general.h" -#include "driver.h" +#include "gx_video.h" #include #include #include diff --git a/wii/driver.h b/gx/gx_video.h similarity index 95% rename from wii/driver.h rename to gx/gx_video.h index 20cc5fc8c2..53cf20bd7d 100644 --- a/wii/driver.h +++ b/gx/gx_video.h @@ -13,8 +13,8 @@ * If not, see . */ -#ifndef WII_VIDEO_H__ -#define WII_VIDEO_H__ +#ifndef _GX_VIDEO_H__ +#define _GX_VIDEO_H__ void wii_video_init(uint32_t *menu_buffer); void wii_video_deinit(void); diff --git a/wii/pkg/cores/presets/.empty b/gx/pkg/cores/presets/.empty similarity index 100% rename from wii/pkg/cores/presets/.empty rename to gx/pkg/cores/presets/.empty diff --git a/wii/pkg/cores/presets/input/.empty b/gx/pkg/cores/presets/input/.empty similarity index 100% rename from wii/pkg/cores/presets/input/.empty rename to gx/pkg/cores/presets/input/.empty diff --git a/wii/pkg/cores/savestates/.empty b/gx/pkg/cores/savestates/.empty similarity index 100% rename from wii/pkg/cores/savestates/.empty rename to gx/pkg/cores/savestates/.empty diff --git a/wii/pkg/cores/sram/.empty b/gx/pkg/cores/sram/.empty similarity index 100% rename from wii/pkg/cores/sram/.empty rename to gx/pkg/cores/sram/.empty diff --git a/wii/pkg/cores/system/.empty b/gx/pkg/cores/system/.empty similarity index 100% rename from wii/pkg/cores/system/.empty rename to gx/pkg/cores/system/.empty diff --git a/wii/pkg/icon.png b/gx/pkg/icon.png similarity index 100% rename from wii/pkg/icon.png rename to gx/pkg/icon.png diff --git a/wii/pkg/meta.xml b/gx/pkg/meta.xml similarity index 76% rename from wii/pkg/meta.xml rename to gx/pkg/meta.xml index 9ccfc75bca..3378a0916b 100644 --- a/wii/pkg/meta.xml +++ b/gx/pkg/meta.xml @@ -1,7 +1,7 @@ - RetroArch Wii - Themaister, Squarepusher2, ToadKing + RetroArch GX + Maister, Squarepusher2, ToadKing 0.9.6 2012 Multi-system emulator diff --git a/wii/salamander/main.c b/gx/salamander/main.c similarity index 100% rename from wii/salamander/main.c rename to gx/salamander/main.c