diff options
| author | Max Horn | 2006-04-02 00:08:22 +0000 |
|---|---|---|
| committer | Max Horn | 2006-04-02 00:08:22 +0000 |
| commit | 587431f8e838bd08d081d65f18b1f9b8f04566b8 (patch) | |
| tree | b0d258b1c28ed19887de121773e723b966369e00 /backends/dc | |
| parent | a2c4795f326e62fe8ff74ce0e29e0174d4dab330 (diff) | |
| download | scummvm-rg350-587431f8e838bd08d081d65f18b1f9b8f04566b8.tar.gz scummvm-rg350-587431f8e838bd08d081d65f18b1f9b8f04566b8.tar.bz2 scummvm-rg350-587431f8e838bd08d081d65f18b1f9b8f04566b8.zip | |
Fully and officially renamed our main function to scummvm_main, thus making
various backend specific hacks unnecessary. As a consequence, it is now the
responsibility of the backend to define main. Hence I adapted the SDL backend
accordingly.
svn-id: r21542
Diffstat (limited to 'backends/dc')
| -rw-r--r-- | backends/dc/dcmain.cpp | 5 | ||||
| -rw-r--r-- | backends/dc/portdefs.h | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/backends/dc/dcmain.cpp b/backends/dc/dcmain.cpp index 0955836bdd..d622c35019 100644 --- a/backends/dc/dcmain.cpp +++ b/backends/dc/dcmain.cpp @@ -21,13 +21,11 @@ * */ - -#define REAL_MAIN - #include <common/stdafx.h> #include <common/scummsys.h> #include <base/engine.h> #include <base/gameDetector.h> +#include <base/main.h> #include <base/plugins.h> #include "dc.h" #include "icon.h" @@ -205,7 +203,6 @@ void dc_init_hardware() init_arm(); } -extern "C" int scummvm_main(int argc, char *argv[]); int main() { static char *argv[] = { "scummvm", NULL, }; diff --git a/backends/dc/portdefs.h b/backends/dc/portdefs.h index 1217810ef5..cedfd5c0fe 100644 --- a/backends/dc/portdefs.h +++ b/backends/dc/portdefs.h @@ -37,6 +37,3 @@ #ifdef Timer #undef Timer #endif -#ifndef REAL_MAIN -#define main scummvm_main -#endif |