From 770123eb743492385c0f4010b9a22b722391809d Mon Sep 17 00:00:00 2001
From: Twinaphex <autechre1024@hotmail.com>
Date: Sat, 4 Aug 2012 03:32:25 +0200
Subject: [PATCH] (RGUI) Move RGUI and make define for it - two competing
 menus/GUIs now to choose from that are mostly platform agnostic

---
 Makefile.wii                          | 2 +-
 console/griffin/griffin.c             | 8 +++++---
 {wii/frontend => console/rgui}/list.c | 0
 {wii/frontend => console/rgui}/list.h | 0
 {wii/frontend => console/rgui}/rgui.c | 1 -
 {wii/frontend => console/rgui}/rgui.h | 0
 wii/frontend/main.c                   | 3 ++-
 7 files changed, 8 insertions(+), 6 deletions(-)
 rename {wii/frontend => console/rgui}/list.c (100%)
 rename {wii/frontend => console/rgui}/list.h (100%)
 rename {wii/frontend => console/rgui}/rgui.c (99%)
 rename {wii/frontend => console/rgui}/rgui.h (100%)

diff --git a/Makefile.wii b/Makefile.wii
index c9760a1694..4a0838a6d9 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -39,7 +39,7 @@ CFLAGS		+= -DHAVE_FILE_LOGGER
 CFLAGS          += -Iconsole/logger
 endif
 
-CFLAGS += -std=gnu99 -DHAVE_DEFAULT_RETROPAD_INPUT -DRARCH_CONSOLE -DHAVE_CONFIGFILE=1 -DGEKKO -DHW_RVL -DHAVE_ZLIB -DHAVE_RARCH_MAIN_WRAP -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"0.9.6\" -Dmain=rarch_main -Wno-char-subscripts 
+CFLAGS += -std=gnu99 -DHAVE_DEFAULT_RETROPAD_INPUT -DHAVE_RGUI -DRARCH_CONSOLE -DHAVE_CONFIGFILE=1 -DGEKKO -DHW_RVL -DHAVE_ZLIB -DHAVE_RARCH_MAIN_WRAP -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"0.9.6\" -Dmain=rarch_main -Wno-char-subscripts 
 
 ifeq ($(DEBUG), 1)
    CFLAGS += -O0 -g
diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index 74587104f6..7a08a07405 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -285,12 +285,14 @@ MENU
 #include "../rmenu/rmenu.c"
 #endif
 
+#ifdef HAVE_RGUI
+#include "../rgui/rgui.c"
+#include "../rgui/list.c"
+#endif
+
 #if defined(_XBOX360)
 #include "../../360/frontend-xdk/menu.cpp"
 #elif defined(_XBOX1)
 #include "../../xbox1/frontend/RetroLaunch/IoSupport.cpp"
 #include "../../xbox1/frontend/RetroLaunch/Surface.cpp"
-#elif defined(GEKKO)
-#include "../../wii/frontend/rgui.c"
-#include "../../wii/frontend/list.c"
 #endif
diff --git a/wii/frontend/list.c b/console/rgui/list.c
similarity index 100%
rename from wii/frontend/list.c
rename to console/rgui/list.c
diff --git a/wii/frontend/list.h b/console/rgui/list.h
similarity index 100%
rename from wii/frontend/list.h
rename to console/rgui/list.h
diff --git a/wii/frontend/rgui.c b/console/rgui/rgui.c
similarity index 99%
rename from wii/frontend/rgui.c
rename to console/rgui/rgui.c
index 32e6691231..3dc8c363ef 100644
--- a/wii/frontend/rgui.c
+++ b/console/rgui/rgui.c
@@ -732,4 +732,3 @@ const char *rgui_iterate(rgui_handle_t *rgui, rgui_action_t action)
 
    return found ? rgui->path_buf : NULL;
 }
-
diff --git a/wii/frontend/rgui.h b/console/rgui/rgui.h
similarity index 100%
rename from wii/frontend/rgui.h
rename to console/rgui/rgui.h
diff --git a/wii/frontend/main.c b/wii/frontend/main.c
index 18739fd007..8a5c281ecf 100644
--- a/wii/frontend/main.c
+++ b/wii/frontend/main.c
@@ -17,11 +17,12 @@
 #undef main
 
 #include <stdbool.h>
-#include "rgui.h"
 #include "../../driver.h"
 #include "../../general.h"
 #include "../../libretro.h"
 
+#include "../../console/rgui/rgui.h"
+
 #include "../../console/rarch_console_input.h"
 #include "../../console/rarch_console_main_wrap.h"