(GX) Build fixes

This commit is contained in:
twinaphex 2013-07-27 21:38:38 +02:00
parent 46e7cb4f7a
commit db9462bc49
3 changed files with 9 additions and 16 deletions

View File

@ -316,20 +316,22 @@ static void system_init(void)
#endif #endif
} }
static void system_exec(const char *path, bool should_load_game);
static void system_exitspawn(void) static void system_exitspawn(void)
{ {
#if defined(IS_SALAMANDER) #if defined(IS_SALAMANDER)
rarch_console_exec(default_paths.libretro_path, gx_rom_path[0] != '\0' ? true : false); system_exec(default_paths.libretro_path, gx_rom_path[0] != '\0' ? true : false);
#elif defined(HW_RVL) #elif defined(HW_RVL)
bool should_load_game = false; bool should_load_game = false;
if (g_extern.lifecycle_mode_state & (1ULL << MODE_EXITSPAWN_START_GAME)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_EXITSPAWN_START_GAME))
should_load_game = true; should_load_game = true;
rarch_console_exec(g_settings.libretro, should_load_game); system_exec(g_settings.libretro, should_load_game);
// direct loading failed (out of memory), try to jump to salamander then load the correct core // direct loading failed (out of memory), try to jump to salamander then load the correct core
char boot_dol[PATH_MAX]; char boot_dol[PATH_MAX];
snprintf(boot_dol, sizeof(boot_dol), "%s/boot.dol", default_paths.core_dir); snprintf(boot_dol, sizeof(boot_dol), "%s/boot.dol", default_paths.core_dir);
rarch_console_exec(boot_dol, should_load_game); system_exec(boot_dol, should_load_game);
#endif #endif
} }

View File

@ -307,16 +307,18 @@ static int system_process_args(int argc, char *argv[])
return 0; return 0;
} }
static void system_exec(const char *path, bool should_load_game);
static void system_exitspawn(void) static void system_exitspawn(void)
{ {
#ifdef IS_SALAMANDER #ifdef IS_SALAMANDER
rarch_console_exec(default_paths.libretro_path, false); system_exec(default_paths.libretro_path, false);
#else #else
bool should_load_game = false; bool should_load_game = false;
if (g_extern.lifecycle_mode_state & (1ULL << MODE_EXITSPAWN_START_GAME)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_EXITSPAWN_START_GAME))
should_load_game = true; should_load_game = true;
rarch_console_exec(g_settings.libretro, should_load_game); system_exec(g_settings.libretro, should_load_game);
#endif #endif
} }

View File

@ -1012,17 +1012,6 @@ static void gx_set_rotation(void *data, unsigned orientation)
gx->should_resize = true; gx->should_resize = true;
} }
static bool gx_set_shader(void *data, enum rarch_shader_type type, const char *path)
{
(void)data;
(void)type;
(void)path;
(void)index;
RARCH_WARN("Shader support is not implemented for GX.\n");
return false;
}
static void gx_set_texture_frame(void *data, const void *frame, static void gx_set_texture_frame(void *data, const void *frame,
bool rgb32, unsigned width, unsigned height, float alpha) bool rgb32, unsigned width, unsigned height, float alpha)
{ {