Merge remote-tracking branch 'funkybit/master'

This commit is contained in:
Marc Zinnschlag 2014-07-29 08:55:56 +02:00
commit ff407a5b87

View file

@ -16,13 +16,19 @@ namespace Files
static const char* const openmwCfgFile = "openmw.cfg"; static const char* const openmwCfgFile = "openmw.cfg";
#if defined(_WIN32) || defined(__WINDOWS__)
static const char* const applicationName = "OpenMW";
#else
static const char* const applicationName = "openmw";
#endif
const char* const mwToken = "?mw?"; const char* const mwToken = "?mw?";
const char* const localToken = "?local?"; const char* const localToken = "?local?";
const char* const userDataToken = "?userdata?"; const char* const userDataToken = "?userdata?";
const char* const globalToken = "?global?"; const char* const globalToken = "?global?";
ConfigurationManager::ConfigurationManager() ConfigurationManager::ConfigurationManager()
: mFixedPath("openmw") : mFixedPath(applicationName)
{ {
setupTokensMapping(); setupTokensMapping();