Mercurial > repos > blastem
diff config.c @ 1696:956c1cce05e2 mame_interp
Merge from default
| author | Michael Pavone <pavone@retrodev.com> |
|---|---|
| date | Thu, 24 Jan 2019 19:15:59 -0800 |
| parents | ba3fb7a3be6b |
| children | eda8df5bc74c |
line wrap: on
line diff
--- a/config.c Tue Dec 25 11:12:26 2018 -0800 +++ b/config.c Thu Jan 24 19:15:59 2019 -0800 @@ -205,14 +205,24 @@ tern_node *parse_bundled_config(char *config_name) { + tern_node *ret = NULL; +#ifdef CONFIG_PATH + if (!strcmp("default.cfg", config_name) || !strcmp("blastem.cfg", config_name)) { + char *confpath = path_append(CONFIG_PATH, config_name); + ret = parse_config_file(confpath); + free(confpath); + } else { +#endif uint32_t confsize; char *confdata = read_bundled_file(config_name, &confsize); - tern_node *ret = NULL; if (confdata) { confdata[confsize] = 0; ret = parse_config(confdata); free(confdata); } +#ifdef CONFIG_PATH + } +#endif return ret; }