X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Flibrary%2Fconfiguration%2Fapplication_configuration.cpp;h=89670bcefe86655bbcf47cf52b7872b825b90eb6;hb=6f4f86051d7e4ad4755152503098bbb3888e4aad;hp=b3927849e073fffcaf96530357b629d88f802f96;hpb=24cc3eb21befb743dfebaea4048e7082bb14a740;p=feisty_meow.git diff --git a/nucleus/library/configuration/application_configuration.cpp b/nucleus/library/configuration/application_configuration.cpp index b3927849..89670bce 100644 --- a/nucleus/library/configuration/application_configuration.cpp +++ b/nucleus/library/configuration/application_configuration.cpp @@ -30,14 +30,14 @@ #include #include #endif -#ifdef _MSC_VER - #include - #include -#else +//#ifdef _MSC_VER +// #include +// #include +//#else #include #include #include -#endif +//#endif #include #include #include @@ -206,12 +206,14 @@ astring application_configuration::application_name() to_return = (char *)buffer; #elif defined(__UNIX__) || defined(__GNU_WINDOWS__) to_return = get_cmdline_from_proc(); +/* #elif defined(_MSC_VER) flexichar low_buff[MAX_ABS_PATH + 1]; GetModuleFileName(NULL_POINTER, low_buff, MAX_ABS_PATH - 1); astring buff = from_unicode_temp(low_buff); buff.to_lower(); // we lower-case the name since windows seems to UC it. to_return = buff; +*/ #else #pragma error("hmmm: no means of finding app name is implemented.") SET_BOGUS_NAME("not_implemented_for_this_OS"); @@ -219,7 +221,8 @@ astring application_configuration::application_name() return to_return; } -#if defined(__UNIX__) || defined(_MSC_VER) || defined(__GNU_WINDOWS__) +#if defined(__UNIX__) || defined(__GNU_WINDOWS__) +//defined(_MSC_VER) || basis::un_int application_configuration::process_id() { return getpid(); } #else #pragma error("hmmm: need process id implementation for this OS!") @@ -233,10 +236,10 @@ astring application_configuration::current_directory() char buff[MAX_ABS_PATH]; getcwd(buff, MAX_ABS_PATH - 1); to_return = buff; -#elif defined(_MSC_VER) - flexichar low_buff[MAX_ABS_PATH + 1]; - GetCurrentDirectory(MAX_ABS_PATH, low_buff); - to_return = from_unicode_temp(low_buff); +//#elif defined(_MSC_VER) +// flexichar low_buff[MAX_ABS_PATH + 1]; +// GetCurrentDirectory(MAX_ABS_PATH, low_buff); +// to_return = from_unicode_temp(low_buff); #else #pragma error("hmmm: need support for current directory on this OS.") to_return = "."; @@ -264,13 +267,13 @@ structures::version application_configuration::get_OS_version() utsname kernel_parms; uname(&kernel_parms); to_return = version(kernel_parms.release); -#elif defined(_MSC_VER) - OSVERSIONINFO info; - info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - ::GetVersionEx(&info); - to_return = version(a_sprintf("%u.%u.%u.%u", basis::un_short(info.dwMajorVersion), - basis::un_short(info.dwMinorVersion), basis::un_short(info.dwPlatformId), - basis::un_short(info.dwBuildNumber))); +//#elif defined(_MSC_VER) +// OSVERSIONINFO info; +// info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); +// ::GetVersionEx(&info); +// to_return = version(a_sprintf("%u.%u.%u.%u", basis::un_short(info.dwMajorVersion), +// basis::un_short(info.dwMinorVersion), basis::un_short(info.dwPlatformId), +// basis::un_short(info.dwBuildNumber))); #else #pragma error("hmmm: need version info for this OS!") #endif