[Scummvm-cvs-logs] SF.net SVN: scummvm: [21553] scummvm/trunk/backends/x11

[fingolfin at users.sourceforge.net]

Revision: 21553
Author:   fingolfin
Date:     2006-04-02 03:01:58 -0700 (Sun, 02 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21553&view=rev

Log Message:
-----------
Fixing the X11 & NULL backends by adding main()

Modified Paths:
--------------
    scummvm/trunk/backends/null/null.cpp
    scummvm/trunk/backends/sdl/sdl.cpp
    scummvm/trunk/backends/x11/x11.cpp
Modified: scummvm/trunk/backends/null/null.cpp
===================================================================
--- scummvm/trunk/backends/null/null.cpp	2006-04-02 09:56:11 UTC (rev 21552)
+++ scummvm/trunk/backends/null/null.cpp	2006-04-02 10:01:58 UTC (rev 21553)
@@ -106,6 +106,11 @@
 	{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()
 {
 }

Modified: scummvm/trunk/backends/sdl/sdl.cpp
===================================================================
--- scummvm/trunk/backends/sdl/sdl.cpp	2006-04-02 09:56:11 UTC (rev 21552)
+++ scummvm/trunk/backends/sdl/sdl.cpp	2006-04-02 10:01:58 UTC (rev 21553)
@@ -48,7 +48,6 @@
 
 int main(int argc, char *argv[]) {
 
-
 #if (defined(WIN32) && defined(NO_CONSOLE)) || defined(__SYMBIAN32__)
 	//
 	// Set up redirects for stdout/stderr under Windows and Symbian.

Modified: scummvm/trunk/backends/x11/x11.cpp
===================================================================
--- scummvm/trunk/backends/x11/x11.cpp	2006-04-02 09:56:11 UTC (rev 21552)
+++ scummvm/trunk/backends/x11/x11.cpp	2006-04-02 10:01:58 UTC (rev 21553)
@@ -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);
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.