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

(limited to 'engines/m4')

diff --git a/engines/m4/detection.cpp b/engines/m4/detection.cpp
index ff440e5d28..259c18f6a7 100644
--- a/engines/m4/detection.cpp
+++ b/engines/m4/detection.cpp
@@ -387,4 +387,8 @@ bool M4MetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::
 	return gd != 0;
 }
 
-REGISTER_PLUGIN(M4, PLUGIN_TYPE_ENGINE, M4MetaEngine);
+#if PLUGIN_ENABLED_DYNAMIC(M4)
+	REGISTER_PLUGIN_DYNAMIC(M4, PLUGIN_TYPE_ENGINE, M4MetaEngine);
+#else
+	REGISTER_PLUGIN_STATIC(M4, PLUGIN_TYPE_ENGINE, M4MetaEngine);
+#endif
diff --git a/engines/m4/module.mk b/engines/m4/module.mk
index 9791f66a58..eea75cab24 100644
--- a/engines/m4/module.mk
+++ b/engines/m4/module.mk
@@ -34,7 +34,7 @@ MODULE_OBJS = \
 
 
 # This module can be built as a plugin
-ifdef BUILD_PLUGINS
+ifeq ($(ENABLE_M4), DYNAMIC_PLUGIN)
 PLUGIN := 1
 endif
 
-- 
cgit v1.2.3