[Scummvm-cvs-logs] CVS: scummvm/common main.cpp,1.13,1.14

Marcus Comstedt marcus_c at users.sourceforge.net
Thu Oct 17 18:40:05 CEST 2002


Update of /cvsroot/scummvm/scummvm/common
In directory usw-pr-cvs1:/tmp/cvs-serv30684/common

Modified Files:
	main.cpp 
Log Message:
Dreamcast port now wraps main() to avoid special kluges in the common main.

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/main.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- main.cpp	16 Oct 2002 17:37:28 -0000	1.13
+++ main.cpp	18 Oct 2002 01:39:24 -0000	1.14
@@ -39,7 +39,7 @@
 
 #if defined(MACOSX) || defined(QTOPIA)
 #include <SDL.h>
-#elif !defined(__MORPHOS__)
+#elif !defined(__MORPHOS__) && !defined(__DC__)
 #undef main
 #endif
 
@@ -143,10 +143,6 @@
 int main(int argc, char *argv[])
 {
 	GameDetector detector;
-#ifdef __DC__
-	extern void dc_init_hardware();
-	dc_init_hardware();
-#endif
 
 #if defined(UNIX)
 	/* On Unix, do a quick endian / alignement check before starting */
@@ -172,14 +168,9 @@
 	g_config->set("versioninfo", SCUMMVM_VERSION);
 	
 	// Parse the command line information
-#if defined(__DC__)
-	extern int dc_setup(GameDetector &detector);
-	dc_setup(detector);
-#else
 	detector._saveconfig = false;
 	detector.updateconfig();
 	detector.parseCommandLine(argc, argv);	
-#endif
 
 	// Create the system object
 	OSystem *system = detector.createSystem();





More information about the Scummvm-git-logs mailing list