diff options
| author | Max Horn | 2007-02-03 18:09:09 +0000 |
|---|---|---|
| committer | Max Horn | 2007-02-03 18:09:09 +0000 |
| commit | 04e76156efa0946586bf0f7f1353f2a0cf469f61 (patch) | |
| tree | d58438d3d8ef1001408365828cbc79c3061cd151 /base | |
| parent | 0fc672025c02c167d8a479b1a8961c3a4545e05a (diff) | |
| download | scummvm-rg350-04e76156efa0946586bf0f7f1353f2a0cf469f61.tar.gz scummvm-rg350-04e76156efa0946586bf0f7f1353f2a0cf469f61.tar.bz2 scummvm-rg350-04e76156efa0946586bf0f7f1353f2a0cf469f61.zip | |
Change s_appName from Common::String to const char * on all platforms
svn-id: r25354
Diffstat (limited to 'base')
| -rw-r--r-- | base/commandLine.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/base/commandLine.cpp b/base/commandLine.cpp index 06d08d05fa..8ef899414e 100644 --- a/base/commandLine.cpp +++ b/base/commandLine.cpp @@ -133,11 +133,7 @@ static const char HELP_STRING[] = ; #endif -#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__) || defined (__SYMBIAN32__)) -static Common::String s_appName("scummvm"); -#else static const char *s_appName = "scummvm"; -#endif static void usage(const char *s, ...) GCC_PRINTF(1, 2); @@ -150,7 +146,7 @@ static void usage(const char *s, ...) { va_end(va); #if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__) || defined (__SYMBIAN32__)) - printf(USAGE_STRING, s_appName.c_str(), buf, s_appName.c_str(), s_appName.c_str()); + printf(USAGE_STRING, s_appName, buf, s_appName, s_appName); #endif exit(1); } @@ -628,11 +624,7 @@ bool processSettings(Common::String &command, Common::StringMap &settings) { printf("Features compiled in: %s\n", gScummVMFeatures); return false; } else if (command == "help") { -#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__) || defined(__SYMBIAN32__)) - printf(HELP_STRING, s_appName.c_str()); -#else printf(HELP_STRING, s_appName); -#endif return false; } #ifdef DETECTOR_TESTING_HACK |