mirror of
https://github.com/libretro/RetroArch
synced 2025-03-26 02:37:23 +00:00
(RARCH_CONSOLE) Reduce code duplication - after environment_get, default dirs are
created and config file is loaded
This commit is contained in:
parent
452dd2cad8
commit
618bbf5aae
@ -65,7 +65,7 @@ static bool libretro_install_core(const char *path_prefix,
|
||||
return true;
|
||||
}
|
||||
|
||||
void rarch_get_environment_console(void)
|
||||
static void rarch_get_environment_console(void)
|
||||
{
|
||||
init_libretro_sym(false);
|
||||
rarch_init_system_info();
|
||||
@ -121,7 +121,16 @@ int main_entry(int argc, char *argv[])
|
||||
if (frontend_ctx && frontend_ctx->environment_get)
|
||||
frontend_ctx->environment_get(argc, argv, args);
|
||||
|
||||
#if !defined(RARCH_CONSOLE) && !defined(HAVE_BB10)
|
||||
#if defined(RARCH_CONSOLE)
|
||||
path_mkdir(default_paths.port_dir);
|
||||
path_mkdir(default_paths.system_dir);
|
||||
path_mkdir(default_paths.savestate_dir);
|
||||
path_mkdir(default_paths.sram_dir);
|
||||
|
||||
config_load();
|
||||
|
||||
rarch_get_environment_console();
|
||||
#elif !defined(HAVE_BB10)
|
||||
rarch_init_msg_queue();
|
||||
int init_ret;
|
||||
if ((init_ret = rarch_main_init(argc, argv))) return init_ret;
|
||||
|
@ -56,8 +56,4 @@ extern const frontend_ctx_driver_t frontend_ctx_apple;
|
||||
const frontend_ctx_driver_t *frontend_ctx_find_driver(const char *ident); // Finds driver with ident. Does not initialize.
|
||||
const frontend_ctx_driver_t *frontend_ctx_init_first(void); // Finds first suitable driver and initializes.
|
||||
|
||||
#ifdef RARCH_CONSOLE
|
||||
extern void rarch_get_environment_console(void);
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
@ -271,17 +271,6 @@ static void get_environment_settings(int argc, char *argv[], void *args)
|
||||
else
|
||||
gx_rom_path[0] = '\0';
|
||||
#endif
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
path_mkdir(default_paths.port_dir);
|
||||
path_mkdir(default_paths.system_dir);
|
||||
path_mkdir(default_paths.savestate_dir);
|
||||
path_mkdir(default_paths.sram_dir);
|
||||
|
||||
config_load();
|
||||
|
||||
rarch_get_environment_console();
|
||||
#endif
|
||||
}
|
||||
|
||||
extern void __exception_setreload(int t);
|
||||
|
@ -286,17 +286,6 @@ static void get_environment_settings(int argc, char *argv[], void *args)
|
||||
snprintf(g_extern.config_path, sizeof(g_extern.config_path), "%s/retroarch.cfg", default_paths.port_dir);
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
path_mkdir(default_paths.port_dir);
|
||||
path_mkdir(default_paths.system_dir);
|
||||
path_mkdir(default_paths.savestate_dir);
|
||||
path_mkdir(default_paths.sram_dir);
|
||||
|
||||
config_load();
|
||||
|
||||
rarch_get_environment_console();
|
||||
#endif
|
||||
}
|
||||
|
||||
static void system_init(void)
|
||||
|
@ -69,17 +69,6 @@ static void get_environment_settings(int argc, char *argv[])
|
||||
snprintf(default_paths.menu_border_file, sizeof(default_paths.menu_border_file), "%s/borders/Menu/main-menu.png", default_paths.core_dir);
|
||||
snprintf(default_paths.border_dir, sizeof(default_paths.border_dir), "%s/borders", default_paths.core_dir);
|
||||
snprintf(g_extern.config_path, sizeof(g_extern.config_path), "%s/retroarch.cfg", default_paths.port_dir);
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
path_mkdir(default_paths.port_dir);
|
||||
path_mkdir(default_paths.system_dir);
|
||||
path_mkdir(default_paths.savestate_dir);
|
||||
path_mkdir(default_paths.sram_dir);
|
||||
|
||||
config_load();
|
||||
|
||||
rarch_get_environment_console();
|
||||
#endif
|
||||
}
|
||||
|
||||
int callback_thread(SceSize args, void *argp)
|
||||
|
@ -255,17 +255,6 @@ static void get_environment_settings(int argc, char *argv[], void *args)
|
||||
strlcpy(default_paths.system_dir, "game:\\system", sizeof(default_paths.system_dir));
|
||||
strlcpy(default_paths.filebrowser_startup_dir, "game:", sizeof(default_paths.filebrowser_startup_dir));
|
||||
#endif
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
path_mkdir(default_paths.port_dir);
|
||||
path_mkdir(default_paths.system_dir);
|
||||
path_mkdir(default_paths.savestate_dir);
|
||||
path_mkdir(default_paths.sram_dir);
|
||||
|
||||
config_load();
|
||||
|
||||
rarch_get_environment_console();
|
||||
#endif
|
||||
}
|
||||
|
||||
static void system_init(void)
|
||||
|
Loading…
x
Reference in New Issue
Block a user