diff options
| author | Neeraj Kumar | 2010-06-08 17:24:29 +0000 |
|---|---|---|
| committer | Neeraj Kumar | 2010-06-08 17:24:29 +0000 |
| commit | 207a5e0779de9f0002b0b1984bde90ce6597e1f2 (patch) | |
| tree | 98883ef89261afd4288f6dadbffe436d5d966dfc /base | |
| parent | e00e94ae18aeb1ed460476f822e20b5bdfe171a4 (diff) | |
| parent | 356728dab7f2c4cedf73684d7fe3b968be7396fd (diff) | |
| download | scummvm-rg350-207a5e0779de9f0002b0b1984bde90ce6597e1f2.tar.gz scummvm-rg350-207a5e0779de9f0002b0b1984bde90ce6597e1f2.tar.bz2 scummvm-rg350-207a5e0779de9f0002b0b1984bde90ce6597e1f2.zip | |
updated my outdate copy of trunk, added couple of more tests in gfxtests
svn-id: r49510
Diffstat (limited to 'base')
| -rw-r--r-- | base/commandLine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/commandLine.cpp b/base/commandLine.cpp index 207ff79c4c..1c548d3f50 100644 --- a/base/commandLine.cpp +++ b/base/commandLine.cpp @@ -51,7 +51,7 @@ static const char USAGE_STRING[] = ; // DONT FIXME: DO NOT ORDER ALPHABETICALLY, THIS IS ORDERED BY IMPORTANCE/CATEGORY! :) -#if defined(PALMOS_MODE) || defined(__SYMBIAN32__) || defined(__GP32__) +#if defined(PALMOS_MODE) || defined(__SYMBIAN32__) || defined(__GP32__) || defined(ANDROID) static const char HELP_STRING[] = "NoUsageString"; // save more data segment space #else static const char HELP_STRING[] = @@ -948,7 +948,7 @@ Common::Error processSettings(Common::String &command, Common::StringMap &settin // 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) && !defined(__GP32__) +#if !defined(MACOS_CARBON) && !defined(_WIN32_WCE) && !defined(PALMOS_MODE) && !defined(__GP32__) && !defined(ANDROID) if (!settings.contains("savepath")) { const char *dir = getenv("SCUMMVM_SAVEPATH"); if (dir && *dir && strlen(dir) < MAXPATHLEN) { |