From 58d3aa8b72e8980339ec7a2fd72b504e1efb3b67 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 7 Jan 2013 18:54:06 +0100 Subject: [PATCH] (RARCH_CONSOLE) Cleanup to frontend to do with LIBRETRO_MANAGEMENT ifdef --- frontend/frontend_gx.c | 14 ++++++-------- frontend/frontend_ps3.c | 15 +++++++-------- frontend/frontend_psp.c | 14 ++++++-------- frontend/frontend_xdk.c | 21 ++++++++++----------- 4 files changed, 29 insertions(+), 35 deletions(-) diff --git a/frontend/frontend_gx.c b/frontend/frontend_gx.c index eb49217b26..60c4c9cfb1 100644 --- a/frontend/frontend_gx.c +++ b/frontend/frontend_gx.c @@ -506,19 +506,17 @@ int main(int argc, char *argv[]) gx_video_t *gx = (gx_video_t*)driver.video_data; gx->menu_data = (uint32_t *) menu_framebuf; - char tmp_path[PATH_MAX]; - const char *extension = default_paths.executable_extension; - snprintf(tmp_path, sizeof(tmp_path), "%s/", default_paths.core_dir); - const char *path_prefix = tmp_path; - - char core_exe_path[1024]; - snprintf(core_exe_path, sizeof(core_exe_path), "%sCORE%s", path_prefix, extension); - rarch_settings_set_default(); rarch_input_set_controls_default(driver.input); rarch_config_load(); #ifdef HAVE_LIBRETRO_MANAGEMENT + char core_exe_path[PATH_MAX]; + char path_prefix[PATH_MAX]; + const char *extension = default_paths.executable_extension; + snprintf(path_prefix, sizeof(path_prefix), "%s/", default_paths.core_dir); + snprintf(core_exe_path, sizeof(core_exe_path), "%sCORE%s", path_prefix, extension); + if (path_file_exists(core_exe_path)) { if (rarch_libretro_core_install(core_exe_path, path_prefix, path_prefix, diff --git a/frontend/frontend_ps3.c b/frontend/frontend_ps3.c index d287e482b1..4b870298e1 100644 --- a/frontend/frontend_ps3.c +++ b/frontend/frontend_ps3.c @@ -270,19 +270,18 @@ int main(int argc, char *argv[]) init_drivers_pre(); driver.input->init(); - char tmp_path[PATH_MAX]; - snprintf(tmp_path, sizeof(tmp_path), "%s/", default_paths.core_dir); - const char *path_prefix = tmp_path; - const char *extension = default_paths.executable_extension; - - char core_exe_path[1024]; - snprintf(core_exe_path, sizeof(core_exe_path), "%sCORE%s", path_prefix, extension); - rarch_settings_set_default(); rarch_input_set_controls_default(driver.input); rarch_config_load(); #ifdef HAVE_LIBRETRO_MANAGEMENT + char core_exe_path[PATH_MAX]; + char path_prefix[PATH_MAX]; + const char *extension = default_paths.executable_extension; + snprintf(path_prefix, sizeof(path_prefix), "%s/", default_paths.core_dir); + snprintf(core_exe_path, sizeof(core_exe_path), "%sCORE%s", path_prefix, extension); + + if (path_file_exists(core_exe_path)) { if (rarch_libretro_core_install(core_exe_path, path_prefix, path_prefix, diff --git a/frontend/frontend_psp.c b/frontend/frontend_psp.c index d2508c4b16..249ce8338c 100644 --- a/frontend/frontend_psp.c +++ b/frontend/frontend_psp.c @@ -131,19 +131,17 @@ int main(int argc, char *argv[]) init_drivers_pre(); driver.input->init(); - char tmp_path[PATH_MAX]; - snprintf(tmp_path, sizeof(tmp_path), "%s/", default_paths.core_dir); - const char *path_prefix = tmp_path; - const char *extension = default_paths.executable_extension; - - char core_exe_path[1024]; - snprintf(core_exe_path, sizeof(core_exe_path), "%sCORE%s", path_prefix, extension); - rarch_settings_set_default(); rarch_input_set_controls_default(input); rarch_config_load(); #ifdef HAVE_LIBRETRO_MANAGEMENT + char core_exe_path[PATH_MAX]; + char path_prefix[PATH_MAX]; + const char *extension = default_paths.executable_extension; + snprintf(path_prefix, sizeof(path_prefix), "%s/", default_paths.core_dir); + snprintf(core_exe_path, sizeof(core_exe_path), "%sCORE%s", path_prefix, extension); + if (path_file_exists(core_exe_path)) { if (rarch_libretro_core_install(core_exe_path, path_prefix, path_prefix, diff --git a/frontend/frontend_xdk.c b/frontend/frontend_xdk.c index fe62434cdd..e33be6c20e 100644 --- a/frontend/frontend_xdk.c +++ b/frontend/frontend_xdk.c @@ -147,22 +147,21 @@ int main(int argc, char *argv[]) init_drivers_pre(); driver.input->init(); -#ifdef _XBOX1 - char path_prefix[256]; - snprintf(path_prefix, sizeof(path_prefix), "D:\\"); -#else - const char *path_prefix = default_paths.filesystem_root_dir; -#endif - const char *extension = default_paths.executable_extension; - - char core_exe_path[1024]; - snprintf(core_exe_path, sizeof(core_exe_path), "%sCORE%s", path_prefix, extension); - rarch_settings_set_default(); rarch_input_set_controls_default(driver.input); rarch_config_load(); #ifdef HAVE_LIBRETRO_MANAGEMENT + char core_exe_path[PATH_MAX]; + char path_prefix[PATH_MAX]; + const char *extension = default_paths.executable_extension; +#ifdef _XBOX1 + snprintf(path_prefix, sizeof(path_prefix), "D:\\"); +#else + snprintf(path_prefix, sizeof(path_prefix), default_paths.filesystem_root_dir); +#endif + snprintf(core_exe_path, sizeof(core_exe_path), "%sCORE%s", path_prefix, extension); + if (path_file_exists(core_exe_path)) { if (rarch_libretro_core_install(core_exe_path, path_prefix, path_prefix,