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

(RARCH_CONSOLE) Reduce code duplication - after environment_get, default dirs are

Browse Source 
created and config file is loaded
This commit is contained in:
twinaphex 2013-10-01 17:06:14 +02:00
parent 452dd2cad8
commit 618bbf5aae
6 changed files with 11 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
frontend/frontend.c
View File

@ -65,7 +65,7 @@ static bool libretro_install_core(const char *path_prefix,
return true; return true;
} }
void rarch_get_environment_console(void) static void rarch_get_environment_console(void)
{ {
init_libretro_sym(false); init_libretro_sym(false);
rarch_init_system_info(); rarch_init_system_info();
@ -121,7 +121,16 @@ int main_entry(int argc, char *argv[])
if (frontend_ctx && frontend_ctx->environment_get) if (frontend_ctx && frontend_ctx->environment_get)
frontend_ctx->environment_get(argc, argv, args); 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(); rarch_init_msg_queue();
int init_ret; int init_ret;
if ((init_ret = rarch_main_init(argc, argv))) return init_ret; if ((init_ret = rarch_main_init(argc, argv))) return init_ret;

4
frontend/frontend_context.h
View File

@ -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_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. 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 #endif

11
frontend/platform/platform_gx.c
View File

@ -271,17 +271,6 @@ static void get_environment_settings(int argc, char *argv[], void *args)
else else
gx_rom_path[0] = '\0'; gx_rom_path[0] = '\0';
#endif #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); extern void __exception_setreload(int t);

11
frontend/platform/platform_ps3.c
View File

@ -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); snprintf(g_extern.config_path, sizeof(g_extern.config_path), "%s/retroarch.cfg", default_paths.port_dir);
#endif #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) static void system_init(void)

11
frontend/platform/platform_psp.c
View File

@ -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.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(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); 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) int callback_thread(SceSize args, void *argp)

11
frontend/platform/platform_xdk.c
View File

@ -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.system_dir, "game:\\system", sizeof(default_paths.system_dir));
strlcpy(default_paths.filebrowser_startup_dir, "game:", sizeof(default_paths.filebrowser_startup_dir)); strlcpy(default_paths.filebrowser_startup_dir, "game:", sizeof(default_paths.filebrowser_startup_dir));
#endif #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) static void system_init(void)