From f69db0983a2f435e7a0147bf8ad82b16196d4397 Mon Sep 17 00:00:00 2001 From: Michael Pavone Date: Tue, 22 Jan 2019 21:15:38 -0800 Subject: Added some Makefile options to build a packaging friendly executable --- config.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'config.c') diff --git a/config.c b/config.c index 10238b8..351bff7 100644 --- a/config.c +++ b/config.c @@ -205,14 +205,24 @@ uint8_t serialize_config_file(tern_node *config, char *path) 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; } -- cgit v1.2.3