mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-20 15:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

(NGC) Build fixes

Browse Source
This commit is contained in:
twinaphex 2013-05-22 00:29:48 +02:00
parent fb934931bc
commit 82b6ab3ec7
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/frontend_console.c
View File

@ -44,6 +44,7 @@ default_paths_t default_paths;
// Rename core filename executable to a more sane name.
#ifdef HAVE_LIBRETRO_MANAGEMENT
static bool libretro_install_core(const char *path_prefix,
const char *core_exe_path)
{
@ -76,6 +77,7 @@ static bool libretro_install_core(const char *path_prefix,
return true;
}
#endif
#define MAKE_DIR(x, name) { \
RARCH_LOG("Checking directory name %s [%s]\n", name, x); \

2
frontend/frontend_console.h
View File

@ -1,7 +1,6 @@
#ifndef _FRONTEND_CONSOLE_H
#define _FRONTEND_CONSOLE_H
#if defined(HAVE_LIBRETRO_MANAGEMENT) || defined(IS_SALAMANDER)
#ifdef GEKKO
#define SALAMANDER_FILE "boot.dol"
#define DEFAULT_EXE_EXT ".dol"
@ -15,6 +14,5 @@
#define SALAMANDER_FILE "default.xex"
#define DEFAULT_EXE_EXT ".xex"
#endif
#endif
#endif

4
frontend/menu/rgui.c
View File

@ -1028,7 +1028,7 @@ static int rgui_settings_toggle_setting(rgui_handle_t *rgui, unsigned setting, r
case RGUI_SETTINGS_RESTART_EMULATOR:
if (action == RGUI_ACTION_OK)
{
#ifdef GEKKO
#if defined(GEKKO) && defined(HW_RVL)
fill_pathname_join(g_extern.fullpath, default_paths.core_dir, SALAMANDER_FILE,
sizeof(g_extern.fullpath));
#endif
@ -2555,7 +2555,7 @@ int rgui_iterate(rgui_handle_t *rgui)
// Core selection on non-console just updates directory listing.
// Will take affect on new ROM load.
#elif defined(GEKKO)
#elif defined(GEKKO) && defined(HW_RVL)
strlcpy(g_settings.libretro, path, sizeof(g_settings.libretro)); // Is this supposed to be here?
fill_pathname_join(g_extern.fullpath, default_paths.core_dir,
SALAMANDER_FILE, sizeof(g_extern.fullpath));

3
gx/gx_input.c
View File

@ -130,7 +130,10 @@ const struct platform_bind platform_keys[] = {
};
static bool g_menu;
#ifdef HW_RVL
static bool g_quit;
#endif
static int16_t gx_input_state(void *data, const struct retro_keybind **binds,
unsigned port, unsigned device,

2
gx/gx_video_inl.h
View File

@ -133,6 +133,7 @@ static GXTexRegion* __GXDefTexRegionCallback(GXTexObj *obj,u8 mapid)
__gx->mtxIdxLo = (__gx->mtxIdxLo&~0x3f)|(mtx&0x3f); \
__gx->dirtyState |= 0x04000000
#if defined(HW_RVL)
#define GX_CopyDisp(dest,clear) \
u8 clflag; \
u32 val; \
@ -164,5 +165,6 @@ static GXTexRegion* __GXDefTexRegionCallback(GXTexObj *obj,u8 mapid)
GX_LOAD_BP_REG(__gx->peCMode0); \
} \
if(clflag) GX_LOAD_BP_REG(__gx->peCntrl)
#endif
#define GX_LoadTexObj(obj,mapid) GX_LoadTexObjPreloaded(obj,(__GXDefTexRegionCallback(obj,mapid)),mapid)