3 files changed, 2 insertions, 38 deletions
diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp
index 0f2a8611a7..cc7f4a4b13 100644
--- a/base/gameDetector.cpp
+++ b/base/gameDetector.cpp
@@ -22,7 +22,6 @@
 
 #include "stdafx.h"
 
-#include "backends/intern.h"
 #include "base/engine.h"
 #include "base/gameDetector.h"
 #include "base/plugins.h"
@@ -587,31 +586,6 @@ bool GameDetector::detectMain() {
 	return true;
 }
 
-OSystem *GameDetector::createSystem() {
-	int gfx_mode = parseGraphicsMode(ConfMan.get("gfx_mode"));	// FIXME: Get rid of this again!
-	
-#if defined(USE_NULL_DRIVER)
-	return OSystem_NULL_create();
-#elif defined(__DC__)
-	return OSystem_Dreamcast_create();
-#elif defined(X11_BACKEND)
-	return OSystem_X11_create();
-#elif defined(__MORPHOS__)
-	return OSystem_MorphOS_create(gfx_mode, ConfMan.getBool("fullscreen"));
-#elif defined(_WIN32_WCE)
-	return OSystem_WINCE3_create();
-#elif defined(MACOS_CARBON)
-	return OSystem_MAC_create(gfx_mode, ConfMan.getBool("fullscreen"));
-#elif defined(__GP32__)	// ph0x
-	return OSystem_GP32_create(GFX_NORMAL, true);
-#elif defined(__PALM_OS__) //chrilith
-	return OSystem_PALMOS_create(gfx_mode, ConfMan.getBool("fullscreen"));
-#else
-	/* SDL is the default driver for now */
-	return OSystem_SDL_create(gfx_mode);
-#endif
-}
-
 Engine *GameDetector::createEngine(OSystem *sys) {
 	assert(_plugin);
 	return _plugin->createInstance(this, sys);
diff --git a/base/gameDetector.h b/base/gameDetector.h
index 8e161933e0..68c7afaa79 100644
--- a/base/gameDetector.h
+++ b/base/gameDetector.h
@@ -74,7 +74,6 @@ public:
 
 	Engine *createEngine(OSystem *system);
 
-	static OSystem *createSystem();
 	static SoundMixer *createMixer();
 	static MidiDriver *createMidi(int midiDriver);
 
diff --git a/base/main.cpp b/base/main.cpp
index e8872a9b78..a494715a6a 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -83,9 +83,6 @@ const char *gScummVMBuildDate = __DATE__ " " __TIME__;
 const char *gScummVMFullVersion = "ScummVM 0.5.4cvs (" __DATE__ " " __TIME__ ")";
 
 
-NewGui	*g_gui = 0;
-OSystem *g_system = 0;
-
 #if defined(WIN32) && defined(NO_CONSOLE)
 #include <cstdio>
 #define STDOUT_FILE	TEXT("stdout.txt")
@@ -186,7 +183,7 @@ static void launcherDialog(GameDetector &detector, OSystem *system) {
 
 	system->set_palette(dummy_palette, 0, 16);
 
-	LauncherDialog dlg(g_gui, detector);
+	LauncherDialog dlg(detector);
 	dlg.runModal();
 }
 
@@ -244,8 +241,7 @@ int main(int argc, char *argv[]) {
 	detector.parseCommandLine(argc, argv);	
 
 	// Create the system object
-	OSystem *system = detector.createSystem();
-	g_system = system;
+	OSystem *system = OSystem::instance();
 	
 	// Create the timer services
 	g_timer = new Timer(system);
@@ -254,9 +250,6 @@ int main(int argc, char *argv[]) {
 	prop.caption = gScummVMFullVersion;
 	system->property(OSystem::PROP_SET_WINDOW_CAPTION, &prop);
 
-	// Create the GUI manager
-	g_gui = new NewGui(system);
-
 	// Unless a game was specified, show the launcher dialog
 	if (detector._targetName.isEmpty())
 		launcherDialog(detector, system);
@@ -307,8 +300,6 @@ int main(int argc, char *argv[]) {
 		delete engine;
 	}
 
-	delete g_gui;
-
 	// ...and quit (the return 0 should never be reached)
 	system->quit();
 	delete system;