From f61d74532b7cb6902db4f01f4e1f429469568a23 Mon Sep 17 00:00:00 2001 From: Chris Apers Date: Tue, 11 Apr 2006 18:19:54 +0000 Subject: Fixed crash with PalmOS ARM version : global objects are allocated but constructors are not called - anyway this var is useless with PalmOS version svn-id: r21805 --- base/gameDetector.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'base') diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp index a08ce3efb0..bcb9d9d5cc 100644 --- a/base/gameDetector.cpp +++ b/base/gameDetector.cpp @@ -128,8 +128,11 @@ static const char HELP_STRING[] = ; #endif - +#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG)) static Common::String s_appName("scummvm"); +#else +static const char *s_appName = "scummvm"; +#endif static void usage(const char *s, ...) GCC_PRINTF(1, 2); @@ -141,7 +144,9 @@ static void usage(const char *s, ...) { vsnprintf(buf, STRINGBUFLEN, s, va); va_end(va); +#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG)) printf(USAGE_STRING, s_appName.c_str(), buf, s_appName.c_str(), s_appName.c_str()); +#endif exit(1); } -- cgit v1.2.3