diff options
author | Marcus Comstedt | 2004-03-13 15:17:13 +0000 |
---|---|---|
committer | Marcus Comstedt | 2004-03-13 15:17:13 +0000 |
commit | 24b86b8566e8bef91085a4b0d29a02be382d5975 (patch) | |
tree | b30fc15116a88022c09f3e5e1645294b99b92639 | |
parent | f712d21c1db7afe86d7011f90e639b73f0edafdf (diff) | |
download | scummvm-rg350-24b86b8566e8bef91085a4b0d29a02be382d5975.tar.gz scummvm-rg350-24b86b8566e8bef91085a4b0d29a02be382d5975.tar.bz2 scummvm-rg350-24b86b8566e8bef91085a4b0d29a02be382d5975.zip |
Use the name "scummvm_main" for the common main function, like WinCE.
svn-id: r13253
-rw-r--r-- | backends/dc/dcmain.cpp | 5 | ||||
-rw-r--r-- | backends/dc/portdefs.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/backends/dc/dcmain.cpp b/backends/dc/dcmain.cpp index 26a964dcf4..1b05778a25 100644 --- a/backends/dc/dcmain.cpp +++ b/backends/dc/dcmain.cpp @@ -198,10 +198,9 @@ void dc_init_hardware() init_arm(); } +extern "C" int scummvm_main(int argc, char *argv[]); int main() { - extern int scumm_main(int argc, char *argv[]); - static char *argv[] = { "scummvm", NULL, NULL, NULL }; static int argc = 3; @@ -215,7 +214,7 @@ int main() PluginManager::instance().unloadPlugins(); - scumm_main(argc, argv); + scummvm_main(argc, argv); exit(0); } diff --git a/backends/dc/portdefs.h b/backends/dc/portdefs.h index fdde6d0f61..8b3d5b3947 100644 --- a/backends/dc/portdefs.h +++ b/backends/dc/portdefs.h @@ -37,5 +37,5 @@ #undef Timer #endif #ifndef REAL_MAIN -#define main scumm_main +#define main scummvm_main #endif |