From ea19cc001837b5ab4625d0c7f100b445e396eaad Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Sat, 30 May 2009 20:34:58 +0200 Subject: Fixed the --home-dir command line option on MacOS X --- src/main.cpp | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index a2db380c..16cbbdfe 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -313,25 +313,24 @@ static void setUpdatesDir() static void initHomeDir(const Options &options) { homeDir = options.homeDir; - + if (homeDir.empty()) { - homeDir = std::string(PHYSFS_getUserDir()) + - "/." + - branding.getValue("appShort", "tmw"); +#ifdef __APPLE__ + // Use Application Directory instead of .tmw + homeDir = std::string(PHYSFS_getUserDir()) + + "/Library/Application Support/" + + branding.getValue("appName", "The Mana World"); +#else + homeDir = std::string(PHYSFS_getUserDir()) + + "/." + branding.getValue("appShort", "tmw"); +#endif } #if defined WIN32 if (!CreateDirectory(homeDir.c_str(), 0) && GetLastError() != ERROR_ALREADY_EXISTS) -#elif defined __APPLE__ - // Use Application Directory instead of .tmw - homeDir = std::string(PHYSFS_getUserDir()) + - "/Library/Application Support/" + - branding.getValue("appName", "The Mana World"); - if ((mkdir(homeDir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) && - (errno != EEXIST)) #else - // Checking if /home/user/.tmw folder exists. + // Create home directory if it doesn't exist already if ((mkdir(homeDir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) && (errno != EEXIST)) #endif -- cgit v1.2.3-70-g09d2