forked from mirrors/nixpkgs
8d65e832f0
Emulators form a class by themselves. So, they should be moved to applications/.
29 lines
1.5 KiB
Diff
29 lines
1.5 KiB
Diff
diff --git a/configuration.c b/configuration.c
|
|
index e6a3841324..afb1d6e2ce 100644
|
|
--- a/configuration.c
|
|
+++ b/configuration.c
|
|
@@ -1456,7 +1456,7 @@ static struct config_path_setting *populate_settings_path(
|
|
SETTING_PATH("core_options_path",
|
|
settings->paths.path_core_options, false, NULL, true);
|
|
SETTING_PATH("libretro_info_path",
|
|
- settings->paths.path_libretro_info, false, NULL, true);
|
|
+ settings->paths.path_libretro_info, false, NULL, false);
|
|
SETTING_PATH("content_database_path",
|
|
settings->paths.path_content_database, false, NULL, true);
|
|
SETTING_PATH("cheat_database_path",
|
|
diff --git a/frontend/drivers/platform_unix.c b/frontend/drivers/platform_unix.c
|
|
index 722e1c595c..e7313ee038 100644
|
|
--- a/frontend/drivers/platform_unix.c
|
|
+++ b/frontend/drivers/platform_unix.c
|
|
@@ -1825,8 +1825,8 @@ static void frontend_unix_get_env(int *argc,
|
|
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_INFO], base_path,
|
|
"core_info", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO]));
|
|
#else
|
|
- fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_INFO], base_path,
|
|
- "cores", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO]));
|
|
+ fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_INFO], "@libretro_info_path@",
|
|
+ "", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO]));
|
|
#endif
|
|
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG], base_path,
|
|
"autoconfig", sizeof(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG]));
|