CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-27 13:16:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5088 from RobLoach/patch-13

Browse Source 
Use GLOBAL_CONFIG_DIR for the skeleton config path
This commit is contained in:
Twinaphex 2017-06-22 01:48:23 +02:00 committed by GitHub
commit ffa9ddeec2
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configuration.c
View File

@ -35,6 +35,7 @@
#include "configuration.h" #include "configuration.h"
#include "content.h" #include "content.h"
#include "config.def.h" #include "config.def.h"
#include "config.features.h"
#include "input/input_config.h" #include "input/input_config.h"
#include "input/input_keymaps.h" #include "input/input_keymaps.h"
#include "input/input_remapping.h" #include "input/input_remapping.h"
@ -1959,13 +1960,10 @@ static config_file_t *open_default_config_file(void)
skeleton_conf[0] = '\0'; skeleton_conf[0] = '\0';
#if defined(__HAIKU__) // Build a retroarch.cfg path from the global config directory (/etc).
fill_pathname_join(skeleton_conf, "/system/settings", fill_pathname_join(skeleton_conf, GLOBAL_CONFIG_DIR,
file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(skeleton_conf)); file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(skeleton_conf));
#else
fill_pathname_join(skeleton_conf, "/etc",
file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(skeleton_conf));
#endif
conf = config_file_new(skeleton_conf); conf = config_file_new(skeleton_conf);
if (conf) if (conf)
RARCH_WARN("Config: using skeleton config \"%s\" as base for a new config file.\n", skeleton_conf); RARCH_WARN("Config: using skeleton config \"%s\" as base for a new config file.\n", skeleton_conf);