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/psp | |
| 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/psp')
| -rw-r--r-- | backends/psp/portdefs.h | 6 | ||||
| -rw-r--r-- | backends/psp/psp_main.cpp | 4 |
2 files changed, 1 insertions, 9 deletions
diff --git a/backends/psp/portdefs.h b/backends/psp/portdefs.h index 558b218f90..a63c8ff39e 100644 --- a/backends/psp/portdefs.h +++ b/backends/psp/portdefs.h @@ -51,12 +51,6 @@ //#define printf pspDebugScreenPrintf #define exit(x) printf("exit() called\n"); sceKernelSleepThread(); -#undef main - -#ifndef REAL_MAIN -#define main scummvm_main -#endif - #endif /* PORTDEFS_H */ diff --git a/backends/psp/psp_main.cpp b/backends/psp/psp_main.cpp index b4af6dbbe7..d981c314dc 100644 --- a/backends/psp/psp_main.cpp +++ b/backends/psp/psp_main.cpp @@ -28,10 +28,10 @@ #include <stdlib.h> #include <string.h> -#define REAL_MAIN #include <common/stdafx.h> #include <common/scummsys.h> #include <base/engine.h> +#include <base/main.h> #include <base/gameDetector.h> #include <base/plugins.h> @@ -123,8 +123,6 @@ int SetupCallbacks(void) } -extern "C" int scummvm_main(int argc, char *argv[]); - int main(void) { //PSPDebugTrace("Init debug screen\n"); |