Merge pull request #3052

d507167f Removed unused mac-specific output folder path (Maxithi)
This commit is contained in:
Riccardo Spagni 2018-01-25 16:54:45 -08:00
commit ea75e71dd2
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -453,8 +453,7 @@ std::string get_nix_version_display_string()
// namespace fs = boost::filesystem; // namespace fs = boost::filesystem;
// Windows < Vista: C:\Documents and Settings\Username\Application Data\CRYPTONOTE_NAME // Windows < Vista: C:\Documents and Settings\Username\Application Data\CRYPTONOTE_NAME
// Windows >= Vista: C:\Users\Username\AppData\Roaming\CRYPTONOTE_NAME // Windows >= Vista: C:\Users\Username\AppData\Roaming\CRYPTONOTE_NAME
// Mac: ~/Library/Application Support/CRYPTONOTE_NAME // Unix & Mac: ~/.CRYPTONOTE_NAME
// Unix: ~/.CRYPTONOTE_NAME
std::string config_folder; std::string config_folder;
#ifdef WIN32 #ifdef WIN32
@ -466,14 +465,7 @@ std::string get_nix_version_display_string()
pathRet = "/"; pathRet = "/";
else else
pathRet = pszHome; pathRet = pszHome;
#ifdef MAC_OSX
// Mac
pathRet /= "Library/Application Support";
config_folder = (pathRet + "/" + CRYPTONOTE_NAME);
#else
// Unix
config_folder = (pathRet + "/." + CRYPTONOTE_NAME); config_folder = (pathRet + "/." + CRYPTONOTE_NAME);
#endif
#endif #endif
return config_folder; return config_folder;