Mercurial > repos > blastem
comparison config.c @ 1693:ba3fb7a3be6b
Added some Makefile options to build a packaging friendly executable
author | Michael Pavone <pavone@retrodev.com> |
---|---|
date | Tue, 22 Jan 2019 21:15:38 -0800 |
parents | 1fc61c844ec5 |
children | eda8df5bc74c |
comparison
equal
deleted
inserted
replaced
1691:e96d0d3bec7f | 1693:ba3fb7a3be6b |
---|---|
203 return ret; | 203 return ret; |
204 } | 204 } |
205 | 205 |
206 tern_node *parse_bundled_config(char *config_name) | 206 tern_node *parse_bundled_config(char *config_name) |
207 { | 207 { |
208 tern_node *ret = NULL; | |
209 #ifdef CONFIG_PATH | |
210 if (!strcmp("default.cfg", config_name) || !strcmp("blastem.cfg", config_name)) { | |
211 char *confpath = path_append(CONFIG_PATH, config_name); | |
212 ret = parse_config_file(confpath); | |
213 free(confpath); | |
214 } else { | |
215 #endif | |
208 uint32_t confsize; | 216 uint32_t confsize; |
209 char *confdata = read_bundled_file(config_name, &confsize); | 217 char *confdata = read_bundled_file(config_name, &confsize); |
210 tern_node *ret = NULL; | |
211 if (confdata) { | 218 if (confdata) { |
212 confdata[confsize] = 0; | 219 confdata[confsize] = 0; |
213 ret = parse_config(confdata); | 220 ret = parse_config(confdata); |
214 free(confdata); | 221 free(confdata); |
215 } | 222 } |
223 #ifdef CONFIG_PATH | |
224 } | |
225 #endif | |
216 return ret; | 226 return ret; |
217 } | 227 } |
218 | 228 |
219 tern_node *load_overrideable_config(char *name, char *bundled_name) | 229 tern_node *load_overrideable_config(char *name, char *bundled_name) |
220 { | 230 { |