From 38a8aa516e0fa315e318801e5399f82e51efa8df Mon Sep 17 00:00:00 2001 From: Jordi Vilalta Prat Date: Tue, 6 May 2008 03:00:26 +0000 Subject: Allow static and dynamic plugins to be used at the same time svn-id: r31888 --- engines/saga/detection.cpp | 6 +++++- engines/saga/module.mk | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'engines/saga') diff --git a/engines/saga/detection.cpp b/engines/saga/detection.cpp index 687018f491..b7d2a3aa39 100644 --- a/engines/saga/detection.cpp +++ b/engines/saga/detection.cpp @@ -162,7 +162,11 @@ bool SagaMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common return gd != 0; } -REGISTER_PLUGIN(SAGA, PLUGIN_TYPE_ENGINE, SagaMetaEngine); +#if PLUGIN_ENABLED_DYNAMIC(SAGA) + REGISTER_PLUGIN_DYNAMIC(SAGA, PLUGIN_TYPE_ENGINE, SagaMetaEngine); +#else + REGISTER_PLUGIN_STATIC(SAGA, PLUGIN_TYPE_ENGINE, SagaMetaEngine); +#endif namespace Saga { diff --git a/engines/saga/module.mk b/engines/saga/module.mk index c1b1c364f6..76783a17ae 100644 --- a/engines/saga/module.mk +++ b/engines/saga/module.mk @@ -35,7 +35,7 @@ MODULE_OBJS := \ sound.o # This module can be built as a plugin -ifdef BUILD_PLUGINS +ifeq ($(ENABLE_SAGA), DYNAMIC_PLUGIN) PLUGIN := 1 endif -- cgit v1.2.3