diff options
| author | Jordi Vilalta Prat | 2010-05-31 23:04:30 +0000 |
|---|---|---|
| committer | Jordi Vilalta Prat | 2010-05-31 23:04:30 +0000 |
| commit | 400542a1fe688bb702a89333c833bc1d89dd1ed4 (patch) | |
| tree | 4620d7c050e48f06a1894ab2de5a399371238eb0 /backends/platform/ps2 | |
| parent | 9d72dde5e7d3e92e7e870350c0b24bf556e425f6 (diff) | |
| download | scummvm-rg350-400542a1fe688bb702a89333c833bc1d89dd1ed4.tar.gz scummvm-rg350-400542a1fe688bb702a89333c833bc1d89dd1ed4.tar.bz2 scummvm-rg350-400542a1fe688bb702a89333c833bc1d89dd1ed4.zip | |
Revert the rest of 49362, which wasn't meant for trunk
svn-id: r49366
Diffstat (limited to 'backends/platform/ps2')
| -rw-r--r-- | backends/platform/ps2/module.mk | 3 | ||||
| -rw-r--r-- | backends/platform/ps2/systemps2.cpp | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/backends/platform/ps2/module.mk b/backends/platform/ps2/module.mk index 69a28b93c4..86b12cb668 100644 --- a/backends/platform/ps2/module.mk +++ b/backends/platform/ps2/module.mk @@ -16,8 +16,7 @@ MODULE_OBJS := \ systemps2.o \ ps2mutex.o \ ps2time.o \ - ps2debug.o \ - ps2loader.o + ps2debug.o MODULE_DIRS += \ backends/platform/ps2/ diff --git a/backends/platform/ps2/systemps2.cpp b/backends/platform/ps2/systemps2.cpp index fe8cc6b29c..49d583d1a1 100644 --- a/backends/platform/ps2/systemps2.cpp +++ b/backends/platform/ps2/systemps2.cpp @@ -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 @@ extern "C" int main(int argc, char *argv[]) { 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); |