diff options
| author | Yotam Barnoy | 2010-08-19 11:18:01 +0000 |
|---|---|---|
| committer | Yotam Barnoy | 2010-08-19 11:18:01 +0000 |
| commit | 8fb92b9e2a95ec8ef137eba930287f3c29772e8d (patch) | |
| tree | 669bf5355b939734410794b83699945a92cc64a0 | |
| parent | 3ece67d1b8cbb6e5bfc493297726b8cb2afc8ee7 (diff) | |
| download | scummvm-rg350-8fb92b9e2a95ec8ef137eba930287f3c29772e8d.tar.gz scummvm-rg350-8fb92b9e2a95ec8ef137eba930287f3c29772e8d.tar.bz2 scummvm-rg350-8fb92b9e2a95ec8ef137eba930287f3c29772e8d.zip | |
PSP: made PSP compile with plugins.
Also removed criticalSection calls from elf-loader.cpp, since now streams are used so the criticalSections are automatic.
svn-id: r52206
| -rw-r--r-- | backends/platform/psp/module.mk | 1 | ||||
| -rw-r--r-- | backends/plugins/elf-loader.cpp | 8 | ||||
| -rw-r--r-- | backends/plugins/psp/psp-provider.h | 3 |
3 files changed, 1 insertions, 11 deletions
diff --git a/backends/platform/psp/module.mk b/backends/platform/psp/module.mk index 4652189ab4..a854ec1252 100644 --- a/backends/platform/psp/module.mk +++ b/backends/platform/psp/module.mk @@ -11,7 +11,6 @@ MODULE_OBJS := powerman.o \ input.o \ cursor.o \ trace.o \ - psploader.o \ pspkeyboard.o \ audio.o \ thread.o \ diff --git a/backends/plugins/elf-loader.cpp b/backends/plugins/elf-loader.cpp index 9787c880ae..2cf61aa246 100644 --- a/backends/plugins/elf-loader.cpp +++ b/backends/plugins/elf-loader.cpp @@ -324,10 +324,6 @@ bool DLObject::open(const char *path) { Common::SeekableReadStream* DLFile; void *ctors_start, *ctors_end; -#ifdef __PSP__ - PowerMan.beginCriticalSection(); -#endif - DBG("open(\"%s\")\n", path); Common::FSNode file(path); @@ -347,10 +343,6 @@ bool DLObject::open(const char *path) { DBG("loaded!/n"); -#ifdef __PSP__ - PowerMan.endCriticalSection(); -#endif - flushDataCache(); ctors_start = symbol("___plugin_ctors"); diff --git a/backends/plugins/psp/psp-provider.h b/backends/plugins/psp/psp-provider.h index efe62ecf2c..b7934179bf 100644 --- a/backends/plugins/psp/psp-provider.h +++ b/backends/plugins/psp/psp-provider.h @@ -40,10 +40,9 @@ class PSPPluginProvider : public ELFPluginProvider { }; public: - Plugin* PSPPluginProvider::createPlugin(const Common::FSNode &node) const { + Plugin* createPlugin(const Common::FSNode &node) const { return new PSPPlugin(node.getPath()); } -} }; #endif /* BACKENDS_PLUGINS_PSP_PSP_PROVIDER_H */ |