diff options
| author | agent-q | 2011-05-21 15:45:51 +0100 |
|---|---|---|
| committer | agent-q | 2011-05-21 15:45:51 +0100 |
| commit | 92a71f7452b83b5491ba0862d8da9f23055fd5bd (patch) | |
| tree | d34c1e20563cc896a6b60750a751b421a35b03cc /base/commandLine.cpp | |
| parent | cb8460e92669da540eb54b80c249a7ba1f7df45a (diff) | |
| download | scummvm-rg350-92a71f7452b83b5491ba0862d8da9f23055fd5bd.tar.gz scummvm-rg350-92a71f7452b83b5491ba0862d8da9f23055fd5bd.tar.bz2 scummvm-rg350-92a71f7452b83b5491ba0862d8da9f23055fd5bd.zip | |
DS: Port of changes from branch-1-2-0 that I should really have moved into the trunk.
"DS: Prevent the command line help string from being included in the binary."
5f3a90a5f6911188b8d1ded08dbdf6d233e9eb7b
"GUI: Allow disabling of Mass Add dialog. Saves a few Kb of binary size on the DS, and is not particularly useful on that platform."
240ff87cf4472538d25a1c5628c8d15f1791ab1c
"GUI: Don't search for theme zip files on startup when running on the DS. Themes aren't supported anyway, and the search severely delays startup."
fe3b18ce0df03117081e83d99f4a2cbd864d3286
Diffstat (limited to 'base/commandLine.cpp')
| -rw-r--r-- | base/commandLine.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/base/commandLine.cpp b/base/commandLine.cpp index b74370df4c..0808f87fb3 100644 --- a/base/commandLine.cpp +++ b/base/commandLine.cpp @@ -50,7 +50,7 @@ static const char USAGE_STRING[] = ; // DONT FIXME: DO NOT ORDER ALPHABETICALLY, THIS IS ORDERED BY IMPORTANCE/CATEGORY! :) -#if defined(__SYMBIAN32__) || defined(__GP32__) || defined(ANDROID) +#if defined(__SYMBIAN32__) || defined(__GP32__) || defined(ANDROID) || defined(__DS__) static const char HELP_STRING[] = "NoUsageString"; // save more data segment space #else static const char HELP_STRING[] = @@ -144,7 +144,7 @@ static void usage(const char *s, ...) { vsnprintf(buf, STRINGBUFLEN, s, va); va_end(va); -#if !(defined(__GP32__) || defined (__SYMBIAN32__)) +#if !(defined(__GP32__) || defined (__SYMBIAN32__) || defined(__DS__)) printf(USAGE_STRING, s_appName, buf, s_appName, s_appName); #endif exit(1); @@ -962,7 +962,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(_WIN32_WCE) && !defined(__GP32__) && !defined(ANDROID) +#if !defined(_WIN32_WCE) && !defined(__GP32__) && !defined(ANDROID) && !defined(__DS__) if (!settings.contains("savepath")) { const char *dir = getenv("SCUMMVM_SAVEPATH"); if (dir && *dir && strlen(dir) < MAXPATHLEN) { |