From d662357999f17c99c4da349fd2b4e9a84e246f55 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 12 Nov 2013 10:36:07 +0100
Subject: [PATCH] (RARCH_CONSOLE) Remove default_paths.border_dir
---
console/rarch_console.h | 1 -
frontend/platform/platform_ps3.c | 3 +--
frontend/platform/platform_psp.c | 1 -
3 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/console/rarch_console.h b/console/rarch_console.h
index 129919fd9c..553e24930f 100644
--- a/console/rarch_console.h
+++ b/console/rarch_console.h
@@ -25,7 +25,6 @@
typedef struct
{
- char border_dir[MAXIMUM_PATH];
char core_dir[MAXIMUM_PATH];
char port_dir[MAXIMUM_PATH];
char savestate_dir[MAXIMUM_PATH];
diff --git a/frontend/platform/platform_ps3.c b/frontend/platform/platform_ps3.c
index 3afb742f58..35505c0e99 100644
--- a/frontend/platform/platform_ps3.c
+++ b/frontend/platform/platform_ps3.c
@@ -228,7 +228,7 @@ static void get_environment_settings(int argc, char *argv[], void *args)
if (g_extern.lifecycle_state & (1ULL << MODE_EXTLAUNCH_MULTIMAN))
{
fill_pathname_join(contentInfoPath, "/dev_hdd0/game/", EMULATOR_CONTENT_DIR, sizeof(contentInfoPath));
- snprintf(default_paths.port_dir, sizeof(default_paths.port_dir), "/dev_hdd0/game/%s/USRDIR", EMULATOR_CONTENT_DIR);
+ fill_pathname_join(default_paths.port_dir, contentInfoPath, "USRDIR", sizeof(default_paths.port_dir));
}
#endif
@@ -247,7 +247,6 @@ static void get_environment_settings(int argc, char *argv[], void *args)
fill_pathname_join(default_paths.system_dir, default_paths.core_dir, "system", sizeof(default_paths.system_dir));
/* now we fill in all the variables */
- fill_pathname_join(default_paths.border_dir, default_paths.core_dir, "borders", sizeof(default_paths.border_dir));
#if defined(HAVE_CG) || defined(HAVE_GLSL)
fill_pathname_join(g_settings.video.shader_dir, default_paths.core_dir, "shaders", sizeof(g_settings.video.shader_dir));
#endif
diff --git a/frontend/platform/platform_psp.c b/frontend/platform/platform_psp.c
index fe32fb2e7d..fd4ec3c3b2 100644
--- a/frontend/platform/platform_psp.c
+++ b/frontend/platform/platform_psp.c
@@ -63,7 +63,6 @@ static void get_environment_settings(int argc, char *argv[])
snprintf(default_paths.system_dir, sizeof(default_paths.system_dir), "%s/system", default_paths.core_dir);
/* now we fill in all the variables */
- 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);
}