mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-29 04:06:40 +00:00
Code Issues Releases Wiki Activity

Follow the 'XDG Base Directory Specification' instead of putting the configfile in ~/.openmw/

Browse source 
Also updated based on feedback from athile:
Fix broken Linux elif.
Use boost:filesystem instead of mkdir for increased future portability.
Break appart class definition and implementation.
This commit is contained in:
Jan-Peter Nilsson 2011-01-14 19:43:51 +01:00
parent 753a4f681e
commit a724de2429
3 changed files with 59 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/CMakeLists.txt
View file

@ -4,7 +4,8 @@ project(OpenMW)
set(GAME set(GAME
main.cpp main.cpp
engine.cpp) engine.cpp
path.cpp)
set(GAME_HEADER set(GAME_HEADER
engine.hpp) engine.hpp)
source_group(game FILES ${GAME} ${GAME_HEADER}) source_group(game FILES ${GAME} ${GAME_HEADER})

56
apps/openmw/path.cpp Normal file
View file

@ -0,0 +1,56 @@
#include "path.hpp"
#include <boost/filesystem.hpp>
#if OGRE_PLATFORM == OGRE_PLATFORM_LINUX
#include <stdlib.h> //getenv
#endif
std::string OMW::Path::getPath(PathTypeEnum parType, const std::string parApp, const std::string parFile)
{
std::string theBasePath;
if(parType == GLOBAL_CFG_PATH)
{
#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
theBasePath = macBundlePath() + "/Contents/MacOS/"; //FIXME do we have global/local with OSX?
#elif OGRE_PLATFORM == OGRE_PLATFORM_LINUX
theBasePath = "/etc/"+parApp+"/";
#else
theBasePath = "";
#endif
}
else
{
#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
theBasePath = macBundlePath() + "/Contents/MacOS/"; //FIXME do we have global/local with OSX?
#elif OGRE_PLATFORM == OGRE_PLATFORM_LINUX
const char* theDir;
if ((theDir = getenv("OPENMW_HOME")) != NULL)
{
theBasePath = std::string(theDir)+"/";
}
else
{
if ((theDir = getenv("XDG_CONFIG_HOME")))
{
theBasePath = std::string(theDir)+"/"+parApp+"/";
}
else
{
if ((theDir = getenv("HOME")) == NULL)
return parFile;
theBasePath = std::string(theDir)+"/.config/"+parApp+"/";
}
}
boost::filesystem::create_directories(boost::filesystem::path(theBasePath));
#else
theBasePath = "";
#endif
}
theBasePath.append(parFile);
return theBasePath;
}

47
apps/openmw/path.hpp
View file

@ -4,12 +4,6 @@
#include <OgrePlatform.h> #include <OgrePlatform.h>
#include <string> #include <string>
#if OGRE_PLATFORM_LINUX
#include <sys/stat.h>
#include <sys/types.h>
#include <stdlib.h> //getenv
#endif
namespace OMW namespace OMW
{ {
class Path class Path
@ -21,46 +15,7 @@ namespace OMW
GLOBAL_CFG_PATH GLOBAL_CFG_PATH
}; };
//TODO use application data dir on windows? static std::string getPath(PathTypeEnum parType, const std::string parApp, const std::string parFile);
static std::string getPath(PathTypeEnum parType, const std::string parApp, const std::string parFile)
{
std::string theBasePath;
if(parType == GLOBAL_CFG_PATH)
{
#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
theBasePath = macBundlePath() + "/Contents/MacOS/"; //FIXME do we have global/local with OSX?
#elif OGRE_PLATFORM_LINUX
theBasePath = "/etc/"+parApp+"/";
#else
theBasePath = "";
#endif
}
else
{
#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
theBasePath = macBundlePath() + "/Contents/MacOS/"; //FIXME do we have global/local with OSX?
#elif OGRE_PLATFORM_LINUX
const char* homedir;
if ((homedir = getenv("OPENMW_HOME")) != NULL)
{
theBasePath = std::string(homedir)+"/";
}
else
{
if ((homedir = getenv("HOME")) == NULL)
return NULL;
theBasePath = std::string(homedir)+"/."+parApp+"/";
}
mkdir(theBasePath.c_str(), 0777);
#else
theBasePath = "";
#endif
}
theBasePath.append(parFile);
return theBasePath;
}
}; };
} }
#endif #endif