From f8bb142f0b7c9ef73a0521199c18e076a259d2c1 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sun, 2 Apr 2006 10:01:58 +0000 Subject: Fixing the X11 & NULL backends by adding main() svn-id: r21553 --- backends/null/null.cpp | 5 +++++ backends/sdl/sdl.cpp | 1 - backends/x11/x11.cpp | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/backends/null/null.cpp b/backends/null/null.cpp index 6a627787d3..d60206f4f4 100644 --- a/backends/null/null.cpp +++ b/backends/null/null.cpp @@ -106,6 +106,11 @@ static const OSystem::GraphicsMode s_supportedGraphicsModes[] = { {0, 0, 0} }; +int main(int argc, char *argv[]) { + // Invoke the actual ScummVM main entry point: + return scummvm_main(argc, argv); +} + OSystem_NULL::OSystem_NULL() { } diff --git a/backends/sdl/sdl.cpp b/backends/sdl/sdl.cpp index 92bdf58a48..0a2de847e1 100644 --- a/backends/sdl/sdl.cpp +++ b/backends/sdl/sdl.cpp @@ -48,7 +48,6 @@ const char* stackCookie = "$STACK: 655360\0"; int main(int argc, char *argv[]) { - #if (defined(WIN32) && defined(NO_CONSOLE)) || defined(__SYMBIAN32__) // // Set up redirects for stdout/stderr under Windows and Symbian. diff --git a/backends/x11/x11.cpp b/backends/x11/x11.cpp index 4b39e707bb..f52f5fdad5 100644 --- a/backends/x11/x11.cpp +++ b/backends/x11/x11.cpp @@ -58,6 +58,11 @@ #include #include +int main(int argc, char *argv[]) { + // Invoke the actual ScummVM main entry point: + return scummvm_main(argc, argv); +} + OSystem *OSystem_X11_create() { return OSystem_X11::create(0, 0); } -- cgit v1.2.3