diff options
author | Max Horn | 2011-06-01 15:15:31 +0200 |
---|---|---|
committer | Max Horn | 2011-06-01 15:15:31 +0200 |
commit | a4610df4825a89ceda39bf1156d1b97a37cceac8 (patch) | |
tree | 8c1fea3f50126079ba64ebf108cb0fd588378960 /base/commandLine.cpp | |
parent | a4d105c902ce1b24c4edd1f3eb43b995bc46c0dd (diff) | |
parent | afe1a77d573ea15c45848c722732f9e84221c669 (diff) | |
download | scummvm-rg350-a4610df4825a89ceda39bf1156d1b97a37cceac8.tar.gz scummvm-rg350-a4610df4825a89ceda39bf1156d1b97a37cceac8.tar.bz2 scummvm-rg350-a4610df4825a89ceda39bf1156d1b97a37cceac8.zip |
Merge branch 'branch-1-3-0' into master
I manually resolved all conflicts, and inspected every single change.
Many were due to the version string mismatch and thus easily resolved.
The MSVC project files add in the 1-3-0 branch were not merged,
neither where the changes to gui/themes/translations.dat.
Conflicts:
NEWS
backends/base-backend.cpp
backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp
backends/module.mk
backends/platform/ds/arm9/makefile
backends/platform/psp/README.PSP
backends/platform/samsungtv/main.cpp
backends/platform/samsungtv/samsungtv.cpp
backends/saves/posix/posix-saves.cpp
base/commandLine.cpp
base/internal_version.h
base/main.cpp
common/array.h
configure
devtools/create_project/create_project.cpp
dists/android/AndroidManifest.xml
dists/android/plugin-manifest.xml
dists/iphone/Info.plist
dists/irix/scummvm.spec
dists/macosx/Info.plist
dists/redhat/scummvm-tools.spec
dists/redhat/scummvm.spec
dists/scummvm.rc
dists/slackware/scummvm.SlackBuild
dists/wii/meta.xml
engines/sci/parser/vocabulary.cpp
engines/tinsel/handle.cpp
gui/themes/translations.dat
Diffstat (limited to 'base/commandLine.cpp')
-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 78eea50082..e34cde4779 100644 --- a/base/commandLine.cpp +++ b/base/commandLine.cpp @@ -52,7 +52,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[] = @@ -146,7 +146,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); |