mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Frontend) Fix default remaps folder for various cores: remap should be nested in config folder (#14563)

Browse Source
This commit is contained in:
AKuHAK 2022-10-29 17:34:08 +03:00 committed by GitHub
parent 1dd165a3bf
commit 3a6a34b2dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/drivers/platform_gx.c
View File

@ -318,7 +318,7 @@ static void frontend_gx_get_env(int *argc, char *argv[],
g_defaults.dirs[DEFAULT_DIR_PORT], "logs", g_defaults.dirs[DEFAULT_DIR_PORT], "logs",
sizeof(g_defaults.dirs[DEFAULT_DIR_LOGS])); sizeof(g_defaults.dirs[DEFAULT_DIR_LOGS]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_REMAP], fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_REMAP],
g_defaults.dirs[DEFAULT_DIR_PORT], "remaps", g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG], "remaps",
sizeof(g_defaults.dirs[DEFAULT_DIR_REMAP])); sizeof(g_defaults.dirs[DEFAULT_DIR_REMAP]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG], fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG],
g_defaults.dirs[DEFAULT_DIR_PORT], "config", g_defaults.dirs[DEFAULT_DIR_PORT], "config",

2
frontend/drivers/platform_orbis.c
View File

@ -129,7 +129,7 @@ static void frontend_orbis_get_env(int *argc, char *argv[],
"downloads", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS])); "downloads", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_PLAYLIST], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_PLAYLIST], user_path,
"playlists", sizeof(g_defaults.dirs[DEFAULT_DIR_PLAYLIST])); "playlists", sizeof(g_defaults.dirs[DEFAULT_DIR_PLAYLIST]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_REMAP], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_REMAP], g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG],
"remaps", sizeof(g_defaults.dirs[DEFAULT_DIR_REMAP])); "remaps", sizeof(g_defaults.dirs[DEFAULT_DIR_REMAP]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SRAM], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SRAM], user_path,
"savefiles", sizeof(g_defaults.dirs[DEFAULT_DIR_SRAM])); "savefiles", sizeof(g_defaults.dirs[DEFAULT_DIR_SRAM]));

2
frontend/drivers/platform_ps2.c
View File

@ -95,7 +95,7 @@ static void create_path_names(void)
"downloads", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS])); "downloads", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_PLAYLIST], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_PLAYLIST], user_path,
"playlists", sizeof(g_defaults.dirs[DEFAULT_DIR_PLAYLIST])); "playlists", sizeof(g_defaults.dirs[DEFAULT_DIR_PLAYLIST]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_REMAP], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_REMAP], g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG],
"remaps", sizeof(g_defaults.dirs[DEFAULT_DIR_REMAP])); "remaps", sizeof(g_defaults.dirs[DEFAULT_DIR_REMAP]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SRAM], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SRAM], user_path,
"savefiles", sizeof(g_defaults.dirs[DEFAULT_DIR_SRAM])); "savefiles", sizeof(g_defaults.dirs[DEFAULT_DIR_SRAM]));

8
frontend/drivers/platform_ps3.c
View File

@ -139,6 +139,12 @@ static void fill_derived_paths(void)
g_defaults.dirs[DEFAULT_DIR_CORE], g_defaults.dirs[DEFAULT_DIR_CORE],
"info", "info",
sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO])); sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG],
g_defaults.dirs[DEFAULT_DIR_CORE],
"config", sizeof(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_MENU_REMAPS],
g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG],
"remaps", sizeof(g_defaults.dirs[DEFAULT_DIR_MENU_REMAPS]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SAVESTATE], fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SAVESTATE],
g_defaults.dirs[DEFAULT_DIR_CORE], g_defaults.dirs[DEFAULT_DIR_CORE],
"savestates", sizeof(g_defaults.dirs[DEFAULT_DIR_SAVESTATE])); "savestates", sizeof(g_defaults.dirs[DEFAULT_DIR_SAVESTATE]));
@ -414,7 +420,7 @@ static int frontend_ps3_exec_exitspawn(const char *path,
#else #else
ret = -1; ret = -1;
#endif #endif
if (ret < 0) if (ret < 0)
{ {
RARCH_WARN("SELF file is not of NPDRM type, trying another approach to boot it...\n"); RARCH_WARN("SELF file is not of NPDRM type, trying another approach to boot it...\n");

6
frontend/drivers/platform_psp.c
View File

@ -119,8 +119,8 @@ static void frontend_psp_get_env_settings(int *argc, char *argv[],
"downloads", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS])); "downloads", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_PLAYLIST], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_PLAYLIST], user_path,
"playlists", sizeof(g_defaults.dirs[DEFAULT_DIR_PLAYLIST])); "playlists", sizeof(g_defaults.dirs[DEFAULT_DIR_PLAYLIST]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_REMAP], user_path, "remaps", fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_REMAP], g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG],
sizeof(g_defaults.dirs[DEFAULT_DIR_REMAP])); "remaps", sizeof(g_defaults.dirs[DEFAULT_DIR_REMAP]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SRAM], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SRAM], user_path,
"savefiles", sizeof(g_defaults.dirs[DEFAULT_DIR_SRAM])); "savefiles", sizeof(g_defaults.dirs[DEFAULT_DIR_SRAM]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SAVESTATE], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SAVESTATE], user_path,
@ -293,7 +293,7 @@ static void frontend_psp_init(void *data)
#endif #endif
#if defined(PSP) && defined(HAVE_KERNEL_PRX) #if defined(PSP) && defined(HAVE_KERNEL_PRX)
pspSdkLoadStartModule("kernel_functions.prx", PSP_MEMORY_PARTITION_KERNEL); pspSdkLoadStartModule("kernel_functions.prx", PSP_MEMORY_PARTITION_KERNEL);
#endif #endif
} }

2
frontend/drivers/platform_qnx.c
View File

@ -119,7 +119,7 @@ static void frontend_qnx_get_env_settings(int *argc, char *argv[],
"filters/audio", sizeof(g_defaults.dirs[DEFAULT_DIR_AUDIO_FILTER])); "filters/audio", sizeof(g_defaults.dirs[DEFAULT_DIR_AUDIO_FILTER]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_PLAYLIST], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_PLAYLIST], user_path,
"playlists", sizeof(g_defaults.dirs[DEFAULT_DIR_PLAYLIST])); "playlists", sizeof(g_defaults.dirs[DEFAULT_DIR_PLAYLIST]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_REMAP], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_REMAP], g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG],
"remaps", sizeof(g_defaults.dirs[DEFAULT_DIR_REMAP])); "remaps", sizeof(g_defaults.dirs[DEFAULT_DIR_REMAP]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SRAM], user_path, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SRAM], user_path,
"saves", sizeof(g_defaults.dirs[DEFAULT_DIR_SRAM])); "saves", sizeof(g_defaults.dirs[DEFAULT_DIR_SRAM]));