diff options
| author | Marcus Comstedt | 2002-10-18 01:39:25 +0000 |
|---|---|---|
| committer | Marcus Comstedt | 2002-10-18 01:39:25 +0000 |
| commit | 005696bc4bd188e753860f852e639b665ee9eebb (patch) | |
| tree | 9086b95a6a69b2a98f964212375c17165e0560c2 | |
| parent | 95bf2b5468e12f6bae9c3d874db87efaf0bcc5e0 (diff) | |
| download | scummvm-rg350-005696bc4bd188e753860f852e639b665ee9eebb.tar.gz scummvm-rg350-005696bc4bd188e753860f852e639b665ee9eebb.tar.bz2 scummvm-rg350-005696bc4bd188e753860f852e639b665ee9eebb.zip | |
Dreamcast port now wraps main() to avoid special kluges in the common main.
svn-id: r5175
| -rw-r--r-- | backends/dc/portdefs.h | 3 | ||||
| -rw-r--r-- | common/main.cpp | 11 |
2 files changed, 4 insertions, 10 deletions
diff --git a/backends/dc/portdefs.h b/backends/dc/portdefs.h index 67e0e9b275..916277b1f4 100644 --- a/backends/dc/portdefs.h +++ b/backends/dc/portdefs.h @@ -13,3 +13,6 @@ #ifdef Timer #undef Timer #endif +#ifndef REAL_MAIN +#define main scumm_main +#endif diff --git a/common/main.cpp b/common/main.cpp index ce5cec3df5..802e789c6d 100644 --- a/common/main.cpp +++ b/common/main.cpp @@ -39,7 +39,7 @@ extern "C" int main(int argc, char *argv[]); #if defined(MACOSX) || defined(QTOPIA) #include <SDL.h> -#elif !defined(__MORPHOS__) +#elif !defined(__MORPHOS__) && !defined(__DC__) #undef main #endif @@ -143,10 +143,6 @@ static void launcherDialog(GameDetector &detector, OSystem *system) 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 @@ int main(int argc, char *argv[]) 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(); |