Index: trunk/src/librnd/core/conf.c =================================================================== --- trunk/src/librnd/core/conf.c (revision 32703) +++ trunk/src/librnd/core/conf.c (revision 32704) @@ -92,9 +92,6 @@ 0, 0, 0, 0, 0, 0, 0, 0, 0 /* make sure the array is addressable until RND_CFR_max_alloc */ }; -extern const char *rnd_conf_internal; - - static lht_node_t *conf_lht_get_confroot(lht_node_t *cwd) { if (cwd == NULL) @@ -1277,7 +1274,7 @@ /* the ultimate fallback: all essential values are built in the executable on a low priority */ - rnd_conf_load_as(RND_CFR_INTERNAL, rnd_conf_internal, 1); + rnd_conf_load_as(RND_CFR_INTERNAL, rnd_app.conf_internal, 1); /* load config files */ rnd_conf_load_as(RND_CFR_SYSTEM, rnd_app.conf_sys_path, 0); Index: trunk/src/librnd/core/hidlib.h =================================================================== --- trunk/src/librnd/core/hidlib.h (revision 32703) +++ trunk/src/librnd/core/hidlib.h (revision 32704) @@ -92,6 +92,9 @@ const char *conf_sysdir_path; const char *conf_sys_path; + /* Recommended: embedded/internal config data (lihata document) */ + const char *conf_internal; + /*** callbacks ***/ /* Optional: called to update crosshair-attached object because crosshair coords likely changed; if NULL, rnd_tool_adjust_attached() is called instead (most apps want that) */ void (*adjust_attached_objects)(rnd_hidlib_t *hl); Index: trunk/src/test-rnd.c =================================================================== --- trunk/src/test-rnd.c (revision 32703) +++ trunk/src/test-rnd.c (revision 32704) @@ -47,7 +47,6 @@ extern const pup_buildin_t pup_buildins[]; -const char *rnd_conf_internal = ""; /* should be generated from the conf */ static const char *default_embedded_menu = ""; static const char *menu_file_paths[] = { "./", "~/.foobar/", NULL }; static const char *menu_name_fmt = "foobar-menu.lht"; Index: trunk/tests/librnd/glue.c =================================================================== --- trunk/tests/librnd/glue.c (revision 32703) +++ trunk/tests/librnd/glue.c (revision 32704) @@ -1,7 +1,6 @@ /*** hidlib glue ***/ TODO const char *rnd_hidlib_default_embedded_menu = ""; -const char *rnd_conf_internal = ""; const char *rnd_menu_file_paths[] = { "./", NULL }; const char *rnd_menu_name_fmt = "menu.lht"; Index: trunk/tests/rnd_printf/glue.c =================================================================== --- trunk/tests/rnd_printf/glue.c (revision 32703) +++ trunk/tests/rnd_printf/glue.c (revision 32704) @@ -7,7 +7,6 @@ TODO const char *rnd_hidlib_default_embedded_menu = ""; -const char *rnd_conf_internal = ""; const char *rnd_menu_file_paths[] = { "./", NULL }; const char *rnd_menu_name_fmt = "menu.lht";