diff options
| author | Eugene Sandulenko | 2005-11-27 02:35:57 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2005-11-27 02:35:57 +0000 |
| commit | edfae828f6a792fe4809ca77a1181a00ed8b9f46 (patch) | |
| tree | 69669f918ebfcb846c9a699a81c1c74804e720d1 /base | |
| parent | e6aba1f7aa00721140809b7b55270c4e171f53e5 (diff) | |
| download | scummvm-rg350-edfae828f6a792fe4809ca77a1181a00ed8b9f46.tar.gz scummvm-rg350-edfae828f6a792fe4809ca77a1181a00ed8b9f46.tar.bz2 scummvm-rg350-edfae828f6a792fe4809ca77a1181a00ed8b9f46.zip | |
Patch #1341626: "New GP32 port"
svn-id: r19710
Diffstat (limited to 'base')
| -rw-r--r-- | base/engine.cpp | 7 | ||||
| -rw-r--r-- | base/main.cpp | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/base/engine.cpp b/base/engine.cpp index 4ef1bb4b31..5e2d1289cb 100644 --- a/base/engine.cpp +++ b/base/engine.cpp @@ -156,13 +156,16 @@ void NORETURN CDECL error(const char *s, ...) { vsnprintf(buf_input, STRINGBUFLEN, s, va); va_end(va); +#ifndef __GP32__ if (g_engine) { g_engine->errorString(buf_input, buf_output); } else { strcpy(buf_output, buf_input); } - -#ifdef __GP32__ //ph0x FIXME? +#else + strcpy(buf_output, buf_input); +#endif +#ifdef __GP32__ printf("ERROR: %s\n", buf_output); #else #ifndef _WIN32_WCE diff --git a/base/main.cpp b/base/main.cpp index b09fd3acbb..8b3426324a 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -321,7 +321,7 @@ static int runGame(GameDetector &detector, OSystem &system) { #ifdef _WIN32_WCE extern "C" int scummvm_main(GameDetector &detector, int argc, char *argv[]) { -#elif defined(__PLAYSTATION2__) || defined(__PSP__) +#elif defined(__PLAYSTATION2__) || defined(__PSP__) || defined(__GP32__) extern "C" int scummvm_main(int argc, char *argv[]) { #else extern "C" int main(int argc, char *argv[]) { |