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/queen | |
| 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/queen')
| -rw-r--r-- | engines/queen/module.mk | 2 | ||||
| -rw-r--r-- | engines/queen/queen.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/engines/queen/module.mk b/engines/queen/module.mk index c691906558..5e0602cae7 100644 --- a/engines/queen/module.mk +++ b/engines/queen/module.mk @@ -24,7 +24,7 @@ MODULE_OBJS := \ walk.o # This module can be built as a plugin -ifdef BUILD_PLUGINS +ifeq ($(ENABLE_QUEEN), DYNAMIC_PLUGIN) PLUGIN := 1 endif diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp index cd492b7934..d1a1247c46 100644 --- a/engines/queen/queen.cpp +++ b/engines/queen/queen.cpp @@ -127,7 +127,11 @@ PluginError QueenMetaEngine::createInstance(OSystem *syst, Engine **engine) cons return kNoError; } -REGISTER_PLUGIN(QUEEN, PLUGIN_TYPE_ENGINE, QueenMetaEngine); +#if PLUGIN_ENABLED_DYNAMIC(QUEEN) + REGISTER_PLUGIN_DYNAMIC(QUEEN, PLUGIN_TYPE_ENGINE, QueenMetaEngine); +#else + REGISTER_PLUGIN_STATIC(QUEEN, PLUGIN_TYPE_ENGINE, QueenMetaEngine); +#endif namespace Queen { |