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/maemo | |
| 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/maemo')
| -rw-r--r-- | backends/maemo/main.cpp | 4 | ||||
| -rw-r--r-- | backends/maemo/portdefs.h | 6 |
2 files changed, 1 insertions, 9 deletions
diff --git a/backends/maemo/main.cpp b/backends/maemo/main.cpp index 7ef2bfd2f1..231f319158 100644 --- a/backends/maemo/main.cpp +++ b/backends/maemo/main.cpp @@ -20,7 +20,6 @@ * */ -#define REAL_MAIN #include <common/stdafx.h> #include <common/scummsys.h> #include <X11/Xlib.h> @@ -29,6 +28,7 @@ #include <SDL/SDL.h> #include <SDL/SDL_syswm.h> +#include "base/main.h" #include <hildon-widgets/hildon-app.h> #include <gtk/gtk.h> #include <libosso.h> @@ -48,8 +48,6 @@ void set_doubling(unsigned char enable) { XSPSetPixelDoubling(wminfo.info.x11.display, 0, enable); } -extern "C" int scummvm_main(int argc, char *argv[]); - int main(int argc, char *argv[]) { osso_context_t *osso_context; diff --git a/backends/maemo/portdefs.h b/backends/maemo/portdefs.h index 82894331b3..f825e5c4e2 100644 --- a/backends/maemo/portdefs.h +++ b/backends/maemo/portdefs.h @@ -52,12 +52,6 @@ typedef signed int int32; /* Whether we should use i386 assembly routines */ #undef USE_NASM -#undef main - -#ifndef REAL_MAIN -#define main scummvm_main -#endif - #include <stdio.h> #include <fcntl.h> #include <stdlib.h> |