(Libretro mgmt) Make IS_SALAMANDER ifdef the default

This commit is contained in:
Twinaphex 2012-08-22 22:46:34 +02:00
parent 07560e25b4
commit 66b8d08fa8
3 changed files with 1 additions and 14 deletions

View File

@ -42,7 +42,7 @@ void rarch_config_load(const char * conf_name, const char * libretro_dir_path, c
{ {
CONFIG_GET_STRING(libretro, "libretro_path"); CONFIG_GET_STRING(libretro, "libretro_path");
if(!rarch_manage_libretro_exists(g_settings.libretro)) if(!path_file_exists(g_settings.libretro))
{ {
char first_file[PATH_MAX]; char first_file[PATH_MAX];
rarch_manage_libretro_set_first_file(first_file, sizeof(first_file), libretro_dir_path, exe_ext); rarch_manage_libretro_set_first_file(first_file, sizeof(first_file), libretro_dir_path, exe_ext);

View File

@ -126,14 +126,6 @@ bool rarch_manage_libretro_extension_supported(const char *filename)
#endif #endif
bool rarch_manage_libretro_exists(const char *path)
{
if(path_file_exists(path))
return true;
else
return false;
}
void rarch_manage_libretro_set_first_file(char *first_file, size_t size_of_first_file, const char *libretro_path, const char * exe_ext) void rarch_manage_libretro_set_first_file(char *first_file, size_t size_of_first_file, const char *libretro_path, const char * exe_ext)
{ {
struct string_list *dir_list = dir_list_new(libretro_path, exe_ext, false); struct string_list *dir_list = dir_list_new(libretro_path, exe_ext, false);
@ -151,7 +143,6 @@ void rarch_manage_libretro_set_first_file(char *first_file, size_t size_of_first
if(first_exe) if(first_exe)
{ {
#ifdef IS_SALAMANDER
char fname_tmp[PATH_MAX]; char fname_tmp[PATH_MAX];
fill_pathname_base(fname_tmp, first_exe, sizeof(fname_tmp)); fill_pathname_base(fname_tmp, first_exe, sizeof(fname_tmp));
@ -170,9 +161,6 @@ void rarch_manage_libretro_set_first_file(char *first_file, size_t size_of_first
} }
strlcpy(first_file, fname_tmp, size_of_first_file); strlcpy(first_file, fname_tmp, size_of_first_file);
#else
strlcpy(first_file, first_exe, size_of_first_file);
#endif
RARCH_LOG("Set first entry in libretro core dir to libretro path: [%s].\n", first_file); RARCH_LOG("Set first entry in libretro core dir to libretro path: [%s].\n", first_file);
} }

View File

@ -43,7 +43,6 @@ bool rarch_configure_libretro_core(const char *full_path, const char *tmp_path,
// Transforms a library id to a name suitable as a pathname. // Transforms a library id to a name suitable as a pathname.
bool rarch_manage_libretro_extension_supported(const char *filename); bool rarch_manage_libretro_extension_supported(const char *filename);
bool rarch_manage_libretro_exists(const char *path);
#endif #endif