X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Flibrary%2Fconfiguration%2Fapplication_configuration.cpp;fp=nucleus%2Flibrary%2Fconfiguration%2Fapplication_configuration.cpp;h=05259f1251587ecebb36fa3d7f75d35ddbfa007e;hb=e16e899f1a75d8c4df9d36ffac2d8d2d401c4114;hp=c8cc179fb67048e38f0fb749f4e9df1ff45d91eb;hpb=7c0f7da17305e9b330b1370e6af250df0b72cca9;p=feisty_meow.git diff --git a/nucleus/library/configuration/application_configuration.cpp b/nucleus/library/configuration/application_configuration.cpp index c8cc179f..05259f12 100644 --- a/nucleus/library/configuration/application_configuration.cpp +++ b/nucleus/library/configuration/application_configuration.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #ifdef __APPLE__ #include @@ -290,18 +291,19 @@ const astring &application_configuration::GLOBAL_SECTION_NAME() { STATIC_STRING( const astring &application_configuration::LOGGING_FOLDER_NAME() { STATIC_STRING("LogPath"); } -const astring &application_configuration::WINDOZE_VIRTUAL_ROOT_NAME() -{ STATIC_STRING("VirtualUnixRoot"); } +//const astring &application_configuration::WINDOZE_VIRTUAL_ROOT_NAME() +//{ STATIC_STRING("VirtualUnixRoot"); } const astring &application_configuration::DEFAULT_VIRTUAL_UNIX_ROOT() { STATIC_STRING("c:/cygwin"); } ////////////// -// static storage for virtual unix root, if used. +// static storage for virtual unix root, if it's used. +// we don't expect it to change during runtime, right? that would be fubar. +// so we cache it once we retrieve it. SAFE_STATIC(astring, static_root_holder, ) -// we don't expect it to change during runtime, right? that would be fubar. astring application_configuration::get_virtual_unix_root() { #ifdef __UNIX__ @@ -315,13 +317,13 @@ astring application_configuration::get_virtual_unix_root() } /* - read the path out of the config file, which should have been set during the + use the path in our system helpers header, which should have been set during the build process if this is really windows. */ - astring virtual_root = read_item(WINDOZE_VIRTUAL_ROOT_NAME()); +/// astring virtual_root = read_item(WINDOZE_VIRTUAL_ROOT_NAME()); + astring virtual_root = FEISTY_MEOW_VIRTUAL_UNIX_ROOT; if (!virtual_root) { // if it has no length, we didn't get our setting! we'll limp along with a guess. - // also don't cache the failure value. maybe it will wake up later! return DEFAULT_VIRTUAL_UNIX_ROOT(); } else { static_root_holder() = virtual_root;