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/parallaction | |
| 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/parallaction')
| -rw-r--r-- | engines/parallaction/detection.cpp | 6 | ||||
| -rw-r--r-- | engines/parallaction/module.mk | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp index a84601f6f9..8841b9ca40 100644 --- a/engines/parallaction/detection.cpp +++ b/engines/parallaction/detection.cpp @@ -233,4 +233,8 @@ bool ParallactionMetaEngine::createInstance(OSystem *syst, Engine **engine, cons return res; } -REGISTER_PLUGIN(PARALLACTION, PLUGIN_TYPE_ENGINE, ParallactionMetaEngine); +#if PLUGIN_ENABLED_DYNAMIC(PARALLACTION) + REGISTER_PLUGIN_DYNAMIC(PARALLACTION, PLUGIN_TYPE_ENGINE, ParallactionMetaEngine); +#else + REGISTER_PLUGIN_STATIC(PARALLACTION, PLUGIN_TYPE_ENGINE, ParallactionMetaEngine); +#endif diff --git a/engines/parallaction/module.mk b/engines/parallaction/module.mk index 9a66b317e2..c7e7af14bf 100644 --- a/engines/parallaction/module.mk +++ b/engines/parallaction/module.mk @@ -29,7 +29,7 @@ MODULE_OBJS := \ walk.o # This module can be built as a plugin -ifdef BUILD_PLUGINS +ifeq ($(ENABLE_PARALLACTION), DYNAMIC_PLUGIN) PLUGIN := 1 endif |