From 66b8d08fa824ca821c7dfebf75f4a82090f448dd Mon Sep 17 00:00:00 2001
From: Twinaphex <autechre1024@hotmail.com>
Date: Wed, 22 Aug 2012 22:46:34 +0200
Subject: [PATCH] (Libretro mgmt) Make IS_SALAMANDER ifdef the default

---
 console/rarch_console_config.c        |  2 +-
 console/rarch_console_libretro_mgmt.c | 12 ------------
 console/rarch_console_libretro_mgmt.h |  1 -
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/console/rarch_console_config.c b/console/rarch_console_config.c
index eab4fb4d08..87e3ffb5e5 100644
--- a/console/rarch_console_config.c
+++ b/console/rarch_console_config.c
@@ -42,7 +42,7 @@ void rarch_config_load(const char * conf_name, const char * libretro_dir_path, c
       {
          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];
             rarch_manage_libretro_set_first_file(first_file, sizeof(first_file), libretro_dir_path, exe_ext);
diff --git a/console/rarch_console_libretro_mgmt.c b/console/rarch_console_libretro_mgmt.c
index c715ac85c7..461caa5d37 100644
--- a/console/rarch_console_libretro_mgmt.c
+++ b/console/rarch_console_libretro_mgmt.c
@@ -126,14 +126,6 @@ bool rarch_manage_libretro_extension_supported(const char *filename)
 
 #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)
 {
    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)
    {
-#ifdef IS_SALAMANDER
       char fname_tmp[PATH_MAX];
       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);
-#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);
    }
 
diff --git a/console/rarch_console_libretro_mgmt.h b/console/rarch_console_libretro_mgmt.h
index 896a19f6c7..c9f46ebd7d 100644
--- a/console/rarch_console_libretro_mgmt.h
+++ b/console/rarch_console_libretro_mgmt.h
@@ -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.
 bool rarch_manage_libretro_extension_supported(const char *filename);
-bool rarch_manage_libretro_exists(const char *path);
 #endif