libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-21 03:31:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change PalmOS ident and fix ARM bug using global initializers

Browse Source 
svn-id: r18744
This commit is contained in:
Chris Apers 2005-09-03 16:08:27 +00:00
parent f7fb3bf7a8
commit 09b0f765d4
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/config-manager.cpp
View File

@ -62,12 +62,23 @@ static bool isValidDomainName(const Common::String &domain) {
namespace Common {
#ifndef PALMOS_ARM
const String ConfigManager::kApplicationDomain("scummvm");
const String ConfigManager::kTransientDomain("__TRANSIENT");
const String trueStr("true");
const String falseStr("false");
#else
const char *ConfigManager::kApplicationDomain = "scummvm";
const char *ConfigManager::kTransientDomain = "__TRANSIENT";
const char *trueStr = "true";
const char *falseStr = "false";
#endif
#pragma mark -
@ -89,7 +100,7 @@ void ConfigManager::loadDefaultConfigFile() {
#if defined (WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
GetWindowsDirectory(configFile, MAXPATHLEN);
strcat(configFile, "\\" DEFAULT_CONFIG_FILE);
#elif defined(__PALM_OS__)
#elif defined(PALMOS_MODE)
strcpy(configFile,"/PALM/Programs/ScummVM/" DEFAULT_CONFIG_FILE);
#elif defined(__PLAYSTATION2__)
strcpy(configFile, "mc0:ScummVM/" DEFAULT_CONFIG_FILE);
@ -101,7 +112,6 @@ void ConfigManager::loadDefaultConfigFile() {
strcpy(configFile, DEFAULT_CONFIG_FILE);
#endif
#endif
loadConfigFile(configFile);
}

5
common/config-manager.h
View File

@ -67,11 +67,16 @@ public:
typedef Map<String, Domain, IgnoreCaseComparator> DomainMap;
#ifndef PALMOS_ARM
/** The name of the application domain (normally 'scummvm'). */
static const String kApplicationDomain;
/** The transient (pseudo) domain. */
static const String kTransientDomain;
#else
static const char *kApplicationDomain;
static const char *kTransientDomain;
#endif
void loadDefaultConfigFile();
void loadConfigFile(const String &filename);