aboutsummaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorMax Horn2010-06-06 09:34:36 +0000
committerMax Horn2010-06-06 09:34:36 +0000
commit46155b2c3678784f6333eed1d65a35eefdcb2001 (patch)
tree1f570683935a5bede0e2475493a4f48b1548d320 /base
parent3efec5720de2c46355c323763dee96b719ed5aa1 (diff)
downloadscummvm-rg350-46155b2c3678784f6333eed1d65a35eefdcb2001.tar.gz
scummvm-rg350-46155b2c3678784f6333eed1d65a35eefdcb2001.tar.bz2
scummvm-rg350-46155b2c3678784f6333eed1d65a35eefdcb2001.zip
Add Android backend from patch #2603856
svn-id: r49449
Diffstat (limited to 'base')
-rw-r--r--base/commandLine.cpp4
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) {