mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-29 18:32:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

(LIBRETRO_MANAGEMENT) rarch_configure_libretro_core() refactored

Browse Source
This commit is contained in:
twinaphex 2013-01-07 18:34:32 +01:00
parent c76ae2a8d1
commit 6bb4ebbdfd
6 changed files with 67 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
console/rarch_console_libretro_mgmt.c
View File

@ -50,57 +50,51 @@ void rarch_console_name_from_id(char *name, size_t size)
}
}
bool rarch_configure_libretro_core(const char *core_exe_path, const char *tmp_path,
// if a CORE executable exists (full_path), this means we have just installed
// a new libretro port and therefore we need to change it to a more
// sane name.
bool rarch_libretro_core_install(const char *core_exe_path, const char *tmp_path,
const char *libretro_path, const char *config_path, const char *extension)
{
bool upgrade_core_succeeded = false;
int ret = 0;
char tmp_path2[PATH_MAX], tmp_pathnewfile[PATH_MAX];
g_extern.verbose = true;
rarch_console_name_from_id(tmp_path2, sizeof(tmp_path2));
strlcat(tmp_path2, extension, sizeof(tmp_path2));
snprintf(tmp_pathnewfile, sizeof(tmp_pathnewfile), "%s%s", tmp_path, tmp_path2);
//install and rename libretro core first if 'CORE' executable exists
if (path_file_exists(core_exe_path))
if (path_file_exists(tmp_pathnewfile))
{
bool ret = false;
char tmp_path2[PATH_MAX], tmp_pathnewfile[PATH_MAX];
// if libretro core already exists, this means we are
// upgrading the libretro core - so delete pre-existing
// file first.
rarch_console_name_from_id(tmp_path2, sizeof(tmp_path2));
strlcat(tmp_path2, extension, sizeof(tmp_path2));
snprintf(tmp_pathnewfile, sizeof(tmp_pathnewfile), "%s%s", tmp_path, tmp_path2);
if (path_file_exists(tmp_pathnewfile))
{
// if libretro core already exists, this means we are
// upgrading the libretro core - so delete pre-existing
// file first.
RARCH_LOG("Upgrading emulator core...\n");
ret = remove(tmp_pathnewfile);
if (ret == 0)
RARCH_LOG("Succeeded in removing pre-existing libretro core: [%s].\n", tmp_pathnewfile);
else
RARCH_ERR("Failed to remove pre-existing libretro core: [%s].\n", tmp_pathnewfile);
}
//now attempt the renaming.
ret = rename(core_exe_path, tmp_pathnewfile);
RARCH_LOG("Upgrading emulator core...\n");
ret = remove(tmp_pathnewfile);
if (ret == 0)
{
RARCH_LOG("libretro core [%s] renamed to: [%s].\n", core_exe_path, tmp_pathnewfile);
snprintf(g_settings.libretro, sizeof(g_settings.libretro), tmp_pathnewfile);
upgrade_core_succeeded = true;
}
RARCH_LOG("Succeeded in removing pre-existing libretro core: [%s].\n", tmp_pathnewfile);
else
{
RARCH_ERR("Failed to rename CORE executable.\n");
RARCH_WARN("CORE executable was not found, or some other error occurred. Will attempt to load libretro core path from config file.\n");
}
RARCH_ERR("Failed to remove pre-existing libretro core: [%s].\n", tmp_pathnewfile);
}
g_extern.verbose = false;
//now attempt the renaming.
ret = rename(core_exe_path, tmp_pathnewfile);
return upgrade_core_succeeded;
if (ret == 0)
{
RARCH_LOG("Libretro core [%s] successfully renamed to: [%s].\n", core_exe_path, tmp_pathnewfile);
snprintf(g_settings.libretro, sizeof(g_settings.libretro), tmp_pathnewfile);
}
else
{
RARCH_ERR("Failed to rename CORE executable.\n");
RARCH_WARN("CORE executable was not found, or some other error occurred. Will attempt to load libretro core path from config file.\n");
return false;
}
return true;
}
bool rarch_manage_libretro_extension_supported(const char *filename)

6
console/rarch_console_libretro_mgmt.h
View File

@ -38,10 +38,8 @@ void rarch_manage_libretro_set_first_file(char *first_file, size_t size_of_first
#ifndef IS_SALAMANDER
// if a CORE executable exists (full_path), this means we have just installed
// a new libretro port and therefore we need to change it to a more
// sane name.
bool rarch_configure_libretro_core(const char *full_path, const char *tmp_path,
//install/upgrade (and rename) libretro core if 'CORE' executable exists
bool rarch_libretro_core_install(const char *full_path, const char *tmp_path,
const char *libretro_path, const char *config_path, const char *extension);
// Transforms a library id to a name suitable as a pathname.

15
frontend/frontend_gx.c
View File

@ -511,19 +511,22 @@ int main(int argc, char *argv[])
snprintf(tmp_path, sizeof(tmp_path), "%s/", default_paths.core_dir);
const char *path_prefix = tmp_path;
char full_path[1024];
snprintf(full_path, sizeof(full_path), "%sCORE%s", path_prefix, 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
if (rarch_configure_libretro_core(full_path, path_prefix, path_prefix,
g_extern.config_path, extension))
if (path_file_exists(core_exe_path))
{
RARCH_LOG("New default libretro core saved to config file: %s.\n", g_settings.libretro);
config_save_file(g_extern.config_path);
if (rarch_libretro_core_install(core_exe_path, path_prefix, path_prefix,
g_extern.config_path, extension))
{
RARCH_LOG("New default libretro core saved to config file: %s.\n", g_settings.libretro);
config_save_file(g_extern.config_path);
}
}
#endif

11
frontend/frontend_ps3.c
View File

@ -283,11 +283,14 @@ int main(int argc, char *argv[])
rarch_config_load();
#ifdef HAVE_LIBRETRO_MANAGEMENT
if (rarch_configure_libretro_core(core_exe_path, path_prefix, path_prefix,
g_extern.config_path, extension))
if (path_file_exists(core_exe_path))
{
RARCH_LOG("New default libretro core saved to config file: %s.\n", g_settings.libretro);
config_save_file(g_extern.config_path);
if (rarch_libretro_core_install(core_exe_path, path_prefix, path_prefix,
g_extern.config_path, extension))
{
RARCH_LOG("New default libretro core saved to config file: %s.\n", g_settings.libretro);
config_save_file(g_extern.config_path);
}
}
#endif

11
frontend/frontend_psp.c
View File

@ -144,11 +144,14 @@ int main(int argc, char *argv[])
rarch_config_load();
#ifdef HAVE_LIBRETRO_MANAGEMENT
if (rarch_configure_libretro_core(core_exe_path, path_prefix, path_prefix,
g_extern.config_path, extension))
if (path_file_exists(core_exe_path))
{
RARCH_LOG("New default libretro core saved to config file: %s.\n", g_settings.libretro);
config_save_file(g_extern.config_path);
if (rarch_libretro_core_install(core_exe_path, path_prefix, path_prefix,
g_extern.config_path, extension))
{
RARCH_LOG("New default libretro core saved to config file: %s.\n", g_settings.libretro);
config_save_file(g_extern.config_path);
}
}
#endif

15
frontend/frontend_xdk.c
View File

@ -155,19 +155,22 @@ int main(int argc, char *argv[])
#endif
const char *extension = default_paths.executable_extension;
char full_path[1024];
snprintf(full_path, sizeof(full_path), "%sCORE%s", path_prefix, 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
if (rarch_configure_libretro_core(full_path, path_prefix, path_prefix,
g_extern.config_path, extension))
if (path_file_exists(core_exe_path))
{
RARCH_LOG("New default libretro core saved to config file: %s.\n", g_settings.libretro);
config_save_file(g_extern.config_path);
if (rarch_libretro_core_install(core_exe_path, path_prefix, path_prefix,
g_extern.config_path, extension))
{
RARCH_LOG("New default libretro core saved to config file: %s.\n", g_settings.libretro);
config_save_file(g_extern.config_path);
}
}
#endif