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/sword1/module.mk  | 2 +-
 engines/sword1/sword1.cpp | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'engines/sword1')

diff --git a/engines/sword1/module.mk b/engines/sword1/module.mk
index 1ee62af853..87c0061c3c 100644
--- a/engines/sword1/module.mk
+++ b/engines/sword1/module.mk
@@ -21,7 +21,7 @@ MODULE_OBJS := \
 	text.o
 
 # This module can be built as a plugin
-ifdef BUILD_PLUGINS
+ifeq ($(ENABLE_SWORD1), DYNAMIC_PLUGIN)
 PLUGIN := 1
 endif
 
diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp
index f58f39c986..7372779199 100644
--- a/engines/sword1/sword1.cpp
+++ b/engines/sword1/sword1.cpp
@@ -187,7 +187,11 @@ PluginError SwordMetaEngine::createInstance(OSystem *syst, Engine **engine) cons
 	return kNoError;
 }
 
-REGISTER_PLUGIN(SWORD1, PLUGIN_TYPE_ENGINE, SwordMetaEngine);
+#if PLUGIN_ENABLED_DYNAMIC(SWORD1)
+	REGISTER_PLUGIN_DYNAMIC(SWORD1, PLUGIN_TYPE_ENGINE, SwordMetaEngine);
+#else
+	REGISTER_PLUGIN_STATIC(SWORD1, PLUGIN_TYPE_ENGINE, SwordMetaEngine);
+#endif
 
 namespace Sword1 {
 
-- 
cgit v1.2.3