diff options
| author | Won Star | 2006-04-13 02:39:59 +0000 |
|---|---|---|
| committer | Won Star | 2006-04-13 02:39:59 +0000 |
| commit | 491d5ad12e42335dc356f73b60d166c5cc990b37 (patch) | |
| tree | 13897819a271b05a7a9a9e20016cb87762d73f1b | |
| parent | f5ab0e55783768e4374e3e8de63fc529e3bb11f0 (diff) | |
| download | scummvm-rg350-491d5ad12e42335dc356f73b60d166c5cc990b37.tar.gz scummvm-rg350-491d5ad12e42335dc356f73b60d166c5cc990b37.tar.bz2 scummvm-rg350-491d5ad12e42335dc356f73b60d166c5cc990b37.zip | |
GP32 uses ARM processor. So some of PalmOS specific changes also apply to GP32.
svn-id: r21834
| -rw-r--r-- | base/gameDetector.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp index bcb9d9d5cc..857771784b 100644 --- a/base/gameDetector.cpp +++ b/base/gameDetector.cpp @@ -56,7 +56,7 @@ static const char USAGE_STRING[] = ; // DONT FIXME: DO NOT ORDER ALPHABETICALLY, THIS IS ORDERED BY IMPORTANCE/CATEGORY! :) -#if defined(PALMOS_MODE) || defined(__SYMBIAN32__) +#if defined(PALMOS_MODE) || defined(__SYMBIAN32__) || defined(__GP32__) static const char HELP_STRING[] = "NoUsageString"; // save more data segment space #else static const char HELP_STRING[] = @@ -128,7 +128,7 @@ static const char HELP_STRING[] = ; #endif -#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG)) +#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__)) static Common::String s_appName("scummvm"); #else static const char *s_appName = "scummvm"; @@ -144,7 +144,7 @@ static void usage(const char *s, ...) { vsnprintf(buf, STRINGBUFLEN, s, va); va_end(va); -#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG)) +#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__)) printf(USAGE_STRING, s_appName.c_str(), buf, s_appName.c_str(), s_appName.c_str()); #endif exit(1); @@ -556,7 +556,7 @@ void GameDetector::processSettings(Common::String &target, Common::StringMap &se // environment variable. This is weaker than a --savepath on the // command line, but overrides the default savepath, hence it is // handled here, just before the command line gets parsed. -#if !defined(MACOS_CARBON) && !defined(_WIN32_WCE) && !defined(PALMOS_MODE) +#if !defined(MACOS_CARBON) && !defined(_WIN32_WCE) && !defined(PALMOS_MODE) && !defined(__GP32__) if (!settings.contains("savepath")) { const char *dir = getenv("SCUMMVM_SAVEPATH"); if (dir && *dir && strlen(dir) < 1024) { |