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

(limited to 'engines/kyra')

diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index 30b0a17d4d..b921314e68 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -550,4 +550,8 @@ SaveStateList KyraMetaEngine::listSaves(const char *target) const {
 	return saveList;
 }
 
-REGISTER_PLUGIN(KYRA, PLUGIN_TYPE_ENGINE, KyraMetaEngine);
+#if PLUGIN_ENABLED_DYNAMIC(KYRA)
+	REGISTER_PLUGIN_DYNAMIC(KYRA, PLUGIN_TYPE_ENGINE, KyraMetaEngine);
+#else
+	REGISTER_PLUGIN_STATIC(KYRA, PLUGIN_TYPE_ENGINE, KyraMetaEngine);
+#endif
diff --git a/engines/kyra/module.mk b/engines/kyra/module.mk
index be8341d90c..aec2778def 100644
--- a/engines/kyra/module.mk
+++ b/engines/kyra/module.mk
@@ -66,7 +66,7 @@ MODULE_OBJS := \
 	wsamovie.o
 
 # This module can be built as a plugin
-ifdef BUILD_PLUGINS
+ifeq ($(ENABLE_KYRA), DYNAMIC_PLUGIN)
 PLUGIN := 1
 endif
 
-- 
cgit v1.2.3