Merge branch 'master' of https://github.com/Themaister/RetroArch

Conflicts:
	console/rmenu/rmenu.h

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

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

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;
 }
-

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"
 

xbox1/frontend/RetroLaunch/IoSupport.cpp

@@ -109,6 +109,7 @@ HRESULT xbox_io_remap(char *szMapping)
    strlcpy(szMap, szMapping, sizeof(szMap));
 
    char *pComma = strstr(szMap, ",");
+
    if (pComma)
    {
       *pComma = 0;

xbox1/frontend/RetroLaunch/Surface.cpp

@@ -40,7 +40,7 @@ bool d3d_surface_new(d3d_surface_t *surface, const char *filename)
 	                                         NULL,                                    // pallete
 	                                         &surface->m_pTexture);                   // texture
 
-	if (FAILED(ret))
+   if(FAILED(ret))
    {
       RARCH_ERR("Error occurred during D3DXCreateTextureFromFileExA().\n");
       return false;