diff options
| author | Max Horn | 2008-05-06 15:21:46 +0000 |
|---|---|---|
| committer | Max Horn | 2008-05-06 15:21:46 +0000 |
| commit | ba6c4a6239d5496f0f218d8fa76c11e77bf9139e (patch) | |
| tree | 8c7c9d3d32b38e8ddd10499ab10e2b63b5eb8f36 /engines/touche | |
| parent | 4331411ebea61072ff0189d7d61ac57199a120af (diff) | |
| parent | 397e04d0b1ff6d96502c4eca42c1ab4a31b2dbcd (diff) | |
| download | scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.tar.gz scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.tar.bz2 scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.zip | |
Merge with trunk, using the svnmerge tool
svn-id: r31898
Diffstat (limited to 'engines/touche')
| -rw-r--r-- | engines/touche/detection.cpp | 6 | ||||
| -rw-r--r-- | engines/touche/module.mk | 2 |
2 files changed, 6 insertions, 2 deletions
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 |