diff options
| author | Jordi Vilalta Prat | 2008-05-06 03:00:26 +0000 |
|---|---|---|
| committer | Jordi Vilalta Prat | 2008-05-06 03:00:26 +0000 |
| commit | 38a8aa516e0fa315e318801e5399f82e51efa8df (patch) | |
| tree | c6f7bc89fe2340a846ef891cefc9031cfdb32ec9 /engines/scumm/detection.cpp | |
| parent | 3ac46924e311afb6b02615af04556da823c4f3f3 (diff) | |
| download | scummvm-rg350-38a8aa516e0fa315e318801e5399f82e51efa8df.tar.gz scummvm-rg350-38a8aa516e0fa315e318801e5399f82e51efa8df.tar.bz2 scummvm-rg350-38a8aa516e0fa315e318801e5399f82e51efa8df.zip | |
Allow static and dynamic plugins to be used at the same time
svn-id: r31888
Diffstat (limited to 'engines/scumm/detection.cpp')
| -rw-r--r-- | engines/scumm/detection.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp index 989ff67627..9359c6610c 100644 --- a/engines/scumm/detection.cpp +++ b/engines/scumm/detection.cpp @@ -873,7 +873,7 @@ PluginError ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) cons break; case 6: switch (res.game.heversion) { -#ifndef DISABLE_HE +#ifdef ENABLE_HE case 200: *engine = new ScummEngine_vCUPhe(syst, res); break; @@ -910,7 +910,7 @@ PluginError ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) cons *engine = new ScummEngine_v6(syst, res); } break; -#ifndef DISABLE_SCUMM_7_8 +#ifdef ENABLE_SCUMM_7_8 case 7: *engine = new ScummEngine_v7(syst, res); break; @@ -966,4 +966,8 @@ SaveStateList ScummMetaEngine::listSaves(const char *target) const { return saveList; } -REGISTER_PLUGIN(SCUMM, PLUGIN_TYPE_ENGINE, ScummMetaEngine); +#if PLUGIN_ENABLED_DYNAMIC(SCUMM) + REGISTER_PLUGIN_DYNAMIC(SCUMM, PLUGIN_TYPE_ENGINE, ScummMetaEngine); +#else + REGISTER_PLUGIN_STATIC(SCUMM, PLUGIN_TYPE_ENGINE, ScummMetaEngine); +#endif |