diff options
| author | Nicolas Bacca | 2004-01-17 23:43:23 +0000 |
|---|---|---|
| committer | Nicolas Bacca | 2004-01-17 23:43:23 +0000 |
| commit | 568913784a6ba965bfe46d0eb6930995fadf9658 (patch) | |
| tree | ef280bd18a3b64369d7a448a9238461da017069c | |
| parent | 14126cde006f4cc055d60cb1b8fdf93e74c5bc6f (diff) | |
| download | scummvm-rg350-568913784a6ba965bfe46d0eb6930995fadf9658.tar.gz scummvm-rg350-568913784a6ba965bfe46d0eb6930995fadf9658.tar.bz2 scummvm-rg350-568913784a6ba965bfe46d0eb6930995fadf9658.zip | |
CE backend specific tweaks
svn-id: r12461
| -rw-r--r-- | base/main.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/base/main.cpp b/base/main.cpp index f5153c8248..289581bacc 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -146,8 +146,6 @@ static void do_memory_test(void) { #endif -#ifndef _WIN32_WCE - static int launcherDialog(GameDetector &detector, OSystem *system) { // FIXME - we need to call init_size() here so that we can display for example // the launcher dialog. But the Engine object will also call it again (possibly @@ -233,7 +231,11 @@ static void runGame(GameDetector &detector, OSystem *system) { delete engine; }; +#ifndef _WIN32_WCE int main(int argc, char *argv[]) { +#else +extern "C" int scummvm_main(GameDetector &detector, int argc, char *argv[]) { +#endif OSystem::Property prop; #if defined(UNIX) @@ -283,7 +285,9 @@ int main(int argc, char *argv[]) { PluginManager::instance().loadPlugins(); // Parse the command line information +#ifndef _WIN32_WCE GameDetector detector; +#endif detector.parseCommandLine(argc, argv); // Create the system object @@ -322,8 +326,6 @@ int main(int argc, char *argv[]) { END_OF_MAIN(); #endif -#endif // WIN32_WCE - /* #if !defined(__PALM_OS__) && !defined(_WIN32_WCE) void *operator new(size_t size) { |