diff options
| author | Tony Puccinelli | 2010-08-06 23:30:27 +0000 |
|---|---|---|
| committer | Tony Puccinelli | 2010-08-06 23:30:27 +0000 |
| commit | 646587f79a4249e25e47af74d36c72602f00dd0f (patch) | |
| tree | 1fe8447d711d17971eaa5a7e6e2e8e93210e14d4 /backends/plugins/ds | |
| parent | 66225374b2f75f8c5b4406564c35ca476242aa81 (diff) | |
| download | scummvm-rg350-646587f79a4249e25e47af74d36c72602f00dd0f.tar.gz scummvm-rg350-646587f79a4249e25e47af74d36c72602f00dd0f.tar.bz2 scummvm-rg350-646587f79a4249e25e47af74d36c72602f00dd0f.zip | |
got rid of gp2xwiz loader (anything useful from it is already incorporated into the ARM loader in the plugins directory at this point) and implemented ARMDLObject as a subtype of DLObject
svn-id: r51813
Diffstat (limited to 'backends/plugins/ds')
| -rw-r--r-- | backends/plugins/ds/ds-provider.cpp | 7 | ||||
| -rw-r--r-- | backends/plugins/ds/ds-provider.h | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/backends/plugins/ds/ds-provider.cpp b/backends/plugins/ds/ds-provider.cpp index 999781754b..c83f198b5e 100644 --- a/backends/plugins/ds/ds-provider.cpp +++ b/backends/plugins/ds/ds-provider.cpp @@ -23,15 +23,18 @@ * */ +#if defined(DYNAMIC_MODULES) && defined(__DS__) + /*#include "base/plugins.h" #include "backends/plugins/dynamic-plugin.h" #include "common/fs.h" #include "backends/plugins/elf-loader.h"*/ +#include "backends/plugins/arm-loader.h" #include "backends/plugins/elf-provider.h" #include "backends/plugins/ds/ds-provider.h" -#if defined(DYNAMIC_MODULES) && defined(__DS__) + class DSPlugin : public ELFPlugin { public: @@ -50,7 +53,7 @@ public: bool DSPlugin::loadPlugin() { assert(!_dlHandle); - DLObject *obj = new DLObject(NULL); + DLObject *obj = new ARMDLObject(); if (obj->open(_filename.c_str())) { _dlHandle = obj; } else { diff --git a/backends/plugins/ds/ds-provider.h b/backends/plugins/ds/ds-provider.h index d9b1ee9cf4..462c3e3b63 100644 --- a/backends/plugins/ds/ds-provider.h +++ b/backends/plugins/ds/ds-provider.h @@ -25,11 +25,8 @@ #include "backends/plugins/elf-provider.h" -#if defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET) - class DSPluginProvider : public ELFPluginProvider { Plugin* createPlugin(const Common::FSNode &node) const; }; -#endif // defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET) |