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/touche/detection.cpp | 6 +++++- engines/touche/module.mk | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'engines/touche') diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp index faf997812c..d2798d7060 100644 --- a/engines/touche/detection.cpp +++ b/engines/touche/detection.cpp @@ -146,4 +146,8 @@ bool ToucheMetaEngine::createInstance(OSystem *syst, Engine **engine, const Comm return gd != 0; } -REGISTER_PLUGIN(TOUCHE, PLUGIN_TYPE_ENGINE, ToucheMetaEngine); +#if PLUGIN_ENABLED_DYNAMIC(TOUCHE) + REGISTER_PLUGIN_DYNAMIC(TOUCHE, PLUGIN_TYPE_ENGINE, ToucheMetaEngine); +#else + REGISTER_PLUGIN_STATIC(TOUCHE, PLUGIN_TYPE_ENGINE, ToucheMetaEngine); +#endif diff --git a/engines/touche/module.mk b/engines/touche/module.mk index 1cfd2d2929..30965e1155 100644 --- a/engines/touche/module.mk +++ b/engines/touche/module.mk @@ -12,7 +12,7 @@ MODULE_OBJS := \ touche.o # This module can be built as a plugin -ifdef BUILD_PLUGINS +ifeq ($(ENABLE_TOUCHE), DYNAMIC_PLUGIN) PLUGIN := 1 endif -- cgit v1.2.3