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

(Salamander) Clean up Wii/Xbox implementations too

Browse Source
This commit is contained in:
twinaphex 2014-06-04 22:48:38 +02:00
parent 1374226c6a
commit a8aa91e03f
2 changed files with 43 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
frontend/platform/platform_gx.c
View File

@ -76,45 +76,32 @@ static void frontend_gx_salamander_init(void)
if (path_file_exists(default_paths.config_path)) if (path_file_exists(default_paths.config_path))
config_file_exists = true; config_file_exists = true;
//try to find CORE executable if(config_file_exists)
char core_executable[PATH_MAX] = {0};
fill_pathname_join(core_executable, default_paths.core_dir, "CORE.dol", sizeof(core_executable));
if(path_file_exists(core_executable))
{ {
//Start CORE executable config_file_t * conf = config_file_new(default_paths.config_path);
strlcpy(libretro_path, core_executable, sizeof(libretro_path)); if (!conf) // stupid libfat bug or something; somtimes it says the file is there when it doesn't
RARCH_LOG("Start [%s].\n", libretro_path); config_file_exists = false;
}
else
{
if(config_file_exists)
{
config_file_t * conf = config_file_new(default_paths.config_path);
if (!conf) // stupid libfat bug or something; somtimes it says the file is there when it doesn't
config_file_exists = false;
else
{
config_get_array(conf, "libretro_path", tmp_str, sizeof(tmp_str));
config_file_free(conf);
strlcpy(libretro_path, tmp_str, sizeof(libretro_path));
}
}
if(!config_file_exists || !strcmp(libretro_path, ""))
find_and_set_first_file();
else else
{ {
RARCH_LOG("Start [%s] found in retroarch.cfg.\n", libretro_path); config_get_array(conf, "libretro_path", tmp_str, sizeof(tmp_str));
config_file_free(conf);
strlcpy(libretro_path, tmp_str, sizeof(libretro_path));
} }
}
if (!config_file_exists) if(!config_file_exists || !strcmp(libretro_path, ""))
{ find_and_set_first_file();
config_file_t *new_conf = config_file_new(NULL); else
config_set_string(new_conf, "libretro_path", libretro_path); {
config_file_write(new_conf, default_paths.config_path); RARCH_LOG("Start [%s] found in retroarch.cfg.\n", libretro_path);
config_file_free(new_conf); }
}
if (!config_file_exists)
{
config_file_t *new_conf = config_file_new(NULL);
config_set_string(new_conf, "libretro_path", libretro_path);
config_file_write(new_conf, default_paths.config_path);
config_file_free(new_conf);
} }
} }

76
frontend/platform/platform_xdk.c
View File

@ -68,69 +68,37 @@ static void find_and_set_first_file(void)
static void frontend_xdk_salamander_init(void) static void frontend_xdk_salamander_init(void)
{ {
XINPUT_STATE state;
(void)state; (void)state;
//WIP - no Xbox 1 controller input yet //normal executable loading path
#ifdef _XBOX360 char tmp_str[PATH_MAX];
XInputGetState(0, &state); bool config_file_exists = false;
if(state.Gamepad.wButtons & XINPUT_GAMEPAD_Y) if(path_file_exists(default_paths.config_path))
config_file_exists = true;
if(config_file_exists)
{
config_file_t * conf = config_file_new(default_paths.config_path);
config_get_array(conf, "libretro_path", tmp_str, sizeof(tmp_str));
strlcpy(libretro_path, tmp_str, sizeof(libretro_path));
}
if(!config_file_exists || !strcmp(libretro_path, ""))
{ {
//override path, boot first executable in cores directory
RARCH_LOG("Fallback - Will boot first executable in RetroArch cores directory.\n");
find_and_set_first_file(); find_and_set_first_file();
} }
else else
#endif
{ {
//normal executable loading path RARCH_LOG("Start [%s] found in retroarch.cfg.\n", libretro_path);
char tmp_str[PATH_MAX]; }
bool config_file_exists = false;
if(path_file_exists(default_paths.config_path)) if (!config_file_exists)
config_file_exists = true; {
config_file_t *new_conf = config_file_new(NULL);
//try to find CORE executable config_set_string(new_conf, "libretro_path", libretro_path);
char core_executable[1024]; config_file_write(new_conf, default_paths.config_path);
#if defined(_XBOX360) config_file_free(new_conf);
strlcpy(core_executable, "game:\\CORE.xex", sizeof(core_executable));
#elif defined(_XBOX1)
fill_pathname_join(core_executable, "D:", "CORE.xbe", sizeof(core_executable));
#endif
if(path_file_exists(core_executable))
{
//Start CORE executable
strlcpy(libretro_path, core_executable, sizeof(libretro_path));
RARCH_LOG("Start [%s].\n", libretro_path);
}
else
{
if(config_file_exists)
{
config_file_t * conf = config_file_new(default_paths.config_path);
config_get_array(conf, "libretro_path", tmp_str, sizeof(tmp_str));
strlcpy(libretro_path, tmp_str, sizeof(libretro_path));
}
if(!config_file_exists || !strcmp(libretro_path, ""))
{
find_and_set_first_file();
}
else
{
RARCH_LOG("Start [%s] found in retroarch.cfg.\n", libretro_path);
}
if (!config_file_exists)
{
config_file_t *new_conf = config_file_new(NULL);
config_set_string(new_conf, "libretro_path", libretro_path);
config_file_write(new_conf, default_paths.config_path);
config_file_free(new_conf);
}
}
} }
} }
#else #else