libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-23 16:09:47 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Use GLOBAL_CONFIG_DIR for the skeleton config path

Browse Source 
This saves us a compilation #if, and allows changing the `GLOBAL_CONFIG_DIR` during compilation if so desired.
This commit is contained in:
Rob Loach 2017-06-21 19:28:40 -04:00 committed by GitHub
parent 8068bcccbe
commit 7b57696a51
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 "content.h"
#include "config.def.h"
#include "config.features.h"
#include "input/input_config.h"
#include "input/input_keymaps.h"
#include "input/input_remapping.h"
@ -1959,13 +1960,10 @@ static config_file_t *open_default_config_file(void)
skeleton_conf[0] = '\0';
#if defined(__HAIKU__)
fill_pathname_join(skeleton_conf, "/system/settings",
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
// Build a retroarch.cfg path from the global config directory (/etc).
fill_pathname_join(skeleton_conf, GLOBAL_CONFIG_DIR,
file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(skeleton_conf));
conf = config_file_new(skeleton_conf);
if (conf)
RARCH_WARN("Config: using skeleton config \"%s\" as base for a new config file.\n", skeleton_conf);