[Scummvm-cvs-logs] SF.net SVN: scummvm:[49366] scummvm/trunk/backends/platform/ps2

[jvprat at users.sourceforge.net]

Revision: 49366
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49366&view=rev
Author:   jvprat
Date:     2010-05-31 23:04:30 +0000 (Mon, 31 May 2010)

Log Message:
-----------
Revert the rest of 49362, which wasn't meant for trunk

Modified Paths:
--------------
    scummvm/trunk/backends/platform/ps2/module.mk
    scummvm/trunk/backends/platform/ps2/systemps2.cpp

Modified: scummvm/trunk/backends/platform/ps2/module.mk
===================================================================
--- scummvm/trunk/backends/platform/ps2/module.mk	2010-05-31 22:58:22 UTC (rev 49365)
+++ scummvm/trunk/backends/platform/ps2/module.mk	2010-05-31 23:04:30 UTC (rev 49366)
@@ -16,8 +16,7 @@
     systemps2.o \
     ps2mutex.o \
     ps2time.o \
-	ps2debug.o \
-	ps2loader.o
+	ps2debug.o
 
 MODULE_DIRS += \
 	backends/platform/ps2/

Modified: scummvm/trunk/backends/platform/ps2/systemps2.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/systemps2.cpp	2010-05-31 22:58:22 UTC (rev 49365)
+++ scummvm/trunk/backends/platform/ps2/systemps2.cpp	2010-05-31 23:04:30 UTC (rev 49366)
@@ -59,7 +59,6 @@
 #include "backends/platform/ps2/ps2debug.h"
 #include "backends/fs/ps2/ps2-fs-factory.h"
 
-#include "backends/plugins/ps2/ps2-provider.h"
 #include "backends/saves/default/default-saves.h"
 #include "common/config-manager.h"
 
@@ -133,10 +132,6 @@
 
 	g_systemPs2->init();
 
-#ifdef DYNAMIC_MODULES
-	PluginManager::instance().addPluginProvider(new PS2PluginProvider());
-#endif
-	
 	sioprintf("init done. starting ScummVM.\n");
 	int res = scummvm_main(argc, argv);
 	sioprintf("scummvm_main terminated: %d\n", res);


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