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

(limited to 'engines/sky')

diff --git a/engines/sky/module.mk b/engines/sky/module.mk
index 67b3b19e5d..9cab69ce9d 100644
--- a/engines/sky/module.mk
+++ b/engines/sky/module.mk
@@ -24,7 +24,7 @@ MODULE_OBJS := \
 	music/musicbase.o
 
 # This module can be built as a plugin
-ifdef BUILD_PLUGINS
+ifeq ($(ENABLE_SKY), DYNAMIC_PLUGIN)
 PLUGIN := 1
 endif
 
diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp
index ae1abc677d..e53458e33a 100644
--- a/engines/sky/sky.cpp
+++ b/engines/sky/sky.cpp
@@ -247,7 +247,11 @@ SaveStateList SkyMetaEngine::listSaves(const char *target) const {
 	return saveList;
 }
 
-REGISTER_PLUGIN(SKY, PLUGIN_TYPE_ENGINE, SkyMetaEngine);
+#if PLUGIN_ENABLED_DYNAMIC(SKY)
+	REGISTER_PLUGIN_DYNAMIC(SKY, PLUGIN_TYPE_ENGINE, SkyMetaEngine);
+#else
+	REGISTER_PLUGIN_STATIC(SKY, PLUGIN_TYPE_ENGINE, SkyMetaEngine);
+#endif
 
 namespace Sky {
 
-- 
cgit v1.2.3