diff options
| author | Matthew Hoops | 2011-04-13 16:04:29 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-04-13 16:04:29 -0400 |
| commit | 6d153f311c65fe414e31e99f8a9a6503c49a01a5 (patch) | |
| tree | 9173f9964c0fec4215514e622f705810730d0ce9 /base | |
| parent | 47c2a9adbe8d9e6640a819386f0f34e929937672 (diff) | |
| parent | 66b43f2312578f35e0718d0699de207a7bf77f1a (diff) | |
| download | scummvm-rg350-6d153f311c65fe414e31e99f8a9a6503c49a01a5.tar.gz scummvm-rg350-6d153f311c65fe414e31e99f8a9a6503c49a01a5.tar.bz2 scummvm-rg350-6d153f311c65fe414e31e99f8a9a6503c49a01a5.zip | |
Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'base')
| -rw-r--r-- | base/plugins.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/base/plugins.cpp b/base/plugins.cpp index 7d0557c474..38b5626fe2 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -172,6 +172,9 @@ public: #if PLUGIN_ENABLED_STATIC(TOON) LINK_PLUGIN(TOON) #endif + #if PLUGIN_ENABLED_STATIC(TSAGE) + LINK_PLUGIN(TSAGE) + #endif #if PLUGIN_ENABLED_STATIC(TOUCHE) LINK_PLUGIN(TOUCHE) #endif |