With this change, backends are now responsible for instantiating their OSystem class before calling scummvm_main (Note: PalmOS and Symbian are not yet converted, and won't work currently)

svn-id: r21557

1 files changed, 3 insertions, 4 deletions

diff --git a/backends/x11/x11.cpp b/backends/x11/x11.cpp
index f52f5fdad5..778028b031 100644
--- a/backends/x11/x11.cpp
+++ b/backends/x11/x11.cpp
@@ -59,14 +59,13 @@
 #include <backends/x11/x11.h>
 
 int main(int argc, char *argv[]) {
+	g_system = OSystem_X11::create(0, 0);
+	assert(g_system);
+
 	// Invoke the actual ScummVM main entry point:
 	return scummvm_main(argc, argv);
 }
 
-OSystem *OSystem_X11_create() {
-	return OSystem_X11::create(0, 0);
-}
-
 OSystem *OSystem_X11::create(int gfx_mode, bool full_screen) {
 	OSystem_X11 *syst = new OSystem_X11();
 	return syst;