mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-17 02:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	console/rmenu/rmenu.h
This commit is contained in:
twinaphex 2012-08-04 05:12:29 +02:00
commit 2d638d5708
9 changed files with 132 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.wii
View File

@ -39,7 +39,7 @@ CFLAGS += -DHAVE_FILE_LOGGER
CFLAGS += -Iconsole/logger CFLAGS += -Iconsole/logger
endif 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) ifeq ($(DEBUG), 1)
CFLAGS += -O0 -g CFLAGS += -O0 -g

8
console/griffin/griffin.c
View File

@ -285,12 +285,14 @@ MENU
#include "../rmenu/rmenu.c" #include "../rmenu/rmenu.c"
#endif #endif
#ifdef HAVE_RGUI
#include "../rgui/rgui.c"
#include "../rgui/list.c"
#endif
#if defined(_XBOX360) #if defined(_XBOX360)
#include "../../360/frontend-xdk/menu.cpp" #include "../../360/frontend-xdk/menu.cpp"
#elif defined(_XBOX1) #elif defined(_XBOX1)
#include "../../xbox1/frontend/RetroLaunch/IoSupport.cpp" #include "../../xbox1/frontend/RetroLaunch/IoSupport.cpp"
#include "../../xbox1/frontend/RetroLaunch/Surface.cpp" #include "../../xbox1/frontend/RetroLaunch/Surface.cpp"
#elif defined(GEKKO)
#include "../../wii/frontend/rgui.c"
#include "../../wii/frontend/list.c"
#endif #endif

0
wii/frontend/list.c → console/rgui/list.c
View File

0
wii/frontend/list.h → console/rgui/list.h
View File

1
wii/frontend/rgui.c → console/rgui/rgui.c
View File

@ -732,4 +732,3 @@ const char *rgui_iterate(rgui_handle_t *rgui, rgui_action_t action)
return found ? rgui->path_buf : NULL; return found ? rgui->path_buf : NULL;
} }

0
wii/frontend/rgui.h → console/rgui/rgui.h
View File

3
wii/frontend/main.c
View File

@ -17,11 +17,12 @@
#undef main #undef main
#include <stdbool.h> #include <stdbool.h>
#include "rgui.h"
#include "../../driver.h" #include "../../driver.h"
#include "../../general.h" #include "../../general.h"
#include "../../libretro.h" #include "../../libretro.h"
#include "../../console/rgui/rgui.h"
#include "../../console/rarch_console_input.h" #include "../../console/rarch_console_input.h"
#include "../../console/rarch_console_main_wrap.h" #include "../../console/rarch_console_main_wrap.h"

1
xbox1/frontend/RetroLaunch/IoSupport.cpp
View File

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

2
xbox1/frontend/RetroLaunch/Surface.cpp
View File

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