aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2006-04-02 10:01:58 +0000
committerMax Horn2006-04-02 10:01:58 +0000
commitf8bb142f0b7c9ef73a0521199c18e076a259d2c1 (patch)
tree9cf19178871b6b807a73e4f3fb0b23067fb5ee60
parenta4d075dad316861755d6f3df390e1e2ab545e582 (diff)
downloadscummvm-rg350-f8bb142f0b7c9ef73a0521199c18e076a259d2c1.tar.gz
scummvm-rg350-f8bb142f0b7c9ef73a0521199c18e076a259d2c1.tar.bz2
scummvm-rg350-f8bb142f0b7c9ef73a0521199c18e076a259d2c1.zip
Fixing the X11 & NULL backends by adding main()
svn-id: r21553
-rw-r--r--backends/null/null.cpp5
-rw-r--r--backends/sdl/sdl.cpp1
-rw-r--r--backends/x11/x11.cpp5
3 files changed, 10 insertions, 1 deletions
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 <sys/ioctl.h>
#include <backends/x11/x11.h>
+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);
}