[Scummvm-cvs-logs] CVS: scummvm/base main.cpp,1.30,1.31
Nicolas Bacca
arisme at users.sourceforge.net
Sat Jan 17 15:44:01 CET 2004
Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1:/tmp/cvs-serv31788
Modified Files:
main.cpp
Log Message:
CE backend specific tweaks
Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/main.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- main.cpp 15 Jan 2004 14:01:57 -0000 1.30
+++ main.cpp 17 Jan 2004 23:43:23 -0000 1.31
@@ -146,8 +146,6 @@
#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 @@
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 @@
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 @@
END_OF_MAIN();
#endif
-#endif // WIN32_WCE
-
/*
#if !defined(__PALM_OS__) && !defined(_WIN32_WCE)
void *operator new(size_t size) {
More information about the Scummvm-git-logs
mailing list