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/gob/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/gob/detection.cpp')
-rw-r--r-- | engines/gob/detection.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/gob/detection.cpp b/engines/gob/detection.cpp index e5575f1e5b..7637605dcd 100644 --- a/engines/gob/detection.cpp +++ b/engines/gob/detection.cpp @@ -1907,7 +1907,11 @@ bool GobMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common: return gd != 0; } -REGISTER_PLUGIN(GOB, PLUGIN_TYPE_ENGINE, GobMetaEngine); +#if PLUGIN_ENABLED_DYNAMIC(GOB) + REGISTER_PLUGIN_DYNAMIC(GOB, PLUGIN_TYPE_ENGINE, GobMetaEngine); +#else + REGISTER_PLUGIN_STATIC(GOB, PLUGIN_TYPE_ENGINE, GobMetaEngine); +#endif namespace Gob { |