aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Puccinelli2010-05-31 22:41:46 +0000
committerTony Puccinelli2010-05-31 22:41:46 +0000
commitc9a38abf605197c4641b74fcef06d44d8d87b2d7 (patch)
tree6aafa543223453247a1fe4d4ad0e0d0e5e09e390
parent2138fe0d5afbcb8566c90e8338a5c2896282772f (diff)
downloadscummvm-rg350-c9a38abf605197c4641b74fcef06d44d8d87b2d7.tar.gz
scummvm-rg350-c9a38abf605197c4641b74fcef06d44d8d87b2d7.tar.bz2
scummvm-rg350-c9a38abf605197c4641b74fcef06d44d8d87b2d7.zip
modifications to get the ps2 to use the ps2loader
svn-id: r49363
-rw-r--r--backends/module.mk1
-rw-r--r--backends/platform/ps2/module.mk3
-rw-r--r--backends/platform/ps2/systemps2.cpp5
3 files changed, 8 insertions, 1 deletions
diff --git a/backends/module.mk b/backends/module.mk
index 59df56b468..46c9e166a6 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -35,6 +35,7 @@ MODULE_OBJS := \
plugins/sdl/sdl-provider.o \
plugins/win32/win32-provider.o \
plugins/psp/psp-provider.o \
+ plugins/ps2/ps2-provider.o \
saves/savefile.o \
saves/default/default-saves.o \
saves/posix/posix-saves.o \
diff --git a/backends/platform/ps2/module.mk b/backends/platform/ps2/module.mk
index 86b12cb668..69a28b93c4 100644
--- a/backends/platform/ps2/module.mk
+++ b/backends/platform/ps2/module.mk
@@ -16,7 +16,8 @@ MODULE_OBJS := \
systemps2.o \
ps2mutex.o \
ps2time.o \
- ps2debug.o
+ ps2debug.o \
+ ps2loader.o
MODULE_DIRS += \
backends/platform/ps2/
diff --git a/backends/platform/ps2/systemps2.cpp b/backends/platform/ps2/systemps2.cpp
index 49d583d1a1..fe8cc6b29c 100644
--- a/backends/platform/ps2/systemps2.cpp
+++ b/backends/platform/ps2/systemps2.cpp
@@ -59,6 +59,7 @@
#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"
@@ -132,6 +133,10 @@ 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);