diff options
| author | Willem Jan Palenstijn | 2013-04-18 23:37:54 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:46:44 +0200 |
| commit | 02c5cc75a7cb8885d2a0fa141fbc0e763c5b31a0 (patch) | |
| tree | 72b64a67ebeca41e9b83593da80850e848a99e2e /base/plugins.cpp | |
| parent | 1539023834a2ad7cf8942711d60983891a10a82a (diff) | |
| parent | 1e200620d673af4acdd2d128ed6e390df001aacf (diff) | |
| download | scummvm-rg350-02c5cc75a7cb8885d2a0fa141fbc0e763c5b31a0.tar.gz scummvm-rg350-02c5cc75a7cb8885d2a0fa141fbc0e763c5b31a0.tar.bz2 scummvm-rg350-02c5cc75a7cb8885d2a0fa141fbc0e763c5b31a0.zip | |
Merge branch 'master'
Conflicts:
configure
base/plugins.cpp
Diffstat (limited to 'base/plugins.cpp')
| -rw-r--r-- | base/plugins.cpp | 109 |
1 files changed, 4 insertions, 105 deletions
diff --git a/base/plugins.cpp b/base/plugins.cpp index f1b08f7893..b8cd097683 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -85,111 +85,7 @@ public: // Iterate over all registered (static) plugins and load them. // Engine plugins - #if PLUGIN_ENABLED_STATIC(SCUMM) - LINK_PLUGIN(SCUMM) - #endif - #if PLUGIN_ENABLED_STATIC(AGI) - LINK_PLUGIN(AGI) - #endif - #if PLUGIN_ENABLED_STATIC(AGOS) - LINK_PLUGIN(AGOS) - #endif - #if PLUGIN_ENABLED_STATIC(CGE) - LINK_PLUGIN(CGE) - #endif - #if PLUGIN_ENABLED_STATIC(CINE) - LINK_PLUGIN(CINE) - #endif - #if PLUGIN_ENABLED_STATIC(COMPOSER) - LINK_PLUGIN(COMPOSER) - #endif - #if PLUGIN_ENABLED_STATIC(CRUISE) - LINK_PLUGIN(CRUISE) - #endif - #if PLUGIN_ENABLED_STATIC(DRACI) - LINK_PLUGIN(DRACI) - #endif - #if PLUGIN_ENABLED_STATIC(DRASCULA) - LINK_PLUGIN(DRASCULA) - #endif - #if PLUGIN_ENABLED_STATIC(DREAMWEB) - LINK_PLUGIN(DREAMWEB) - #endif - #if PLUGIN_ENABLED_STATIC(GOB) - LINK_PLUGIN(GOB) - #endif - #if PLUGIN_ENABLED_STATIC(GROOVIE) - LINK_PLUGIN(GROOVIE) - #endif - #if PLUGIN_ENABLED_STATIC(HUGO) - LINK_PLUGIN(HUGO) - #endif - #if PLUGIN_ENABLED_STATIC(KYRA) - LINK_PLUGIN(KYRA) - #endif - #if PLUGIN_ENABLED_STATIC(LASTEXPRESS) - LINK_PLUGIN(LASTEXPRESS) - #endif - #if PLUGIN_ENABLED_STATIC(LURE) - LINK_PLUGIN(LURE) - #endif - #if PLUGIN_ENABLED_STATIC(MADE) - LINK_PLUGIN(MADE) - #endif - #if PLUGIN_ENABLED_STATIC(MOHAWK) - LINK_PLUGIN(MOHAWK) - #endif - #if PLUGIN_ENABLED_STATIC(NEVERHOOD) - LINK_PLUGIN(NEVERHOOD) - #endif - #if PLUGIN_ENABLED_STATIC(PARALLACTION) - LINK_PLUGIN(PARALLACTION) - #endif - #if PLUGIN_ENABLED_STATIC(QUEEN) - LINK_PLUGIN(QUEEN) - #endif - #if PLUGIN_ENABLED_STATIC(SAGA) - LINK_PLUGIN(SAGA) - #endif - #if PLUGIN_ENABLED_STATIC(SCI) - LINK_PLUGIN(SCI) - #endif - #if PLUGIN_ENABLED_STATIC(SKY) - LINK_PLUGIN(SKY) - #endif - #if PLUGIN_ENABLED_STATIC(SWORD1) - LINK_PLUGIN(SWORD1) - #endif - #if PLUGIN_ENABLED_STATIC(SWORD2) - LINK_PLUGIN(SWORD2) - #endif - #if PLUGIN_ENABLED_STATIC(SWORD25) - LINK_PLUGIN(SWORD25) - #endif - #if PLUGIN_ENABLED_STATIC(TEENAGENT) - LINK_PLUGIN(TEENAGENT) - #endif - #if PLUGIN_ENABLED_STATIC(TESTBED) - LINK_PLUGIN(TESTBED) - #endif - #if PLUGIN_ENABLED_STATIC(TINSEL) - LINK_PLUGIN(TINSEL) - #endif - #if PLUGIN_ENABLED_STATIC(TOLTECS) - LINK_PLUGIN(TOLTECS) - #endif - #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 - #if PLUGIN_ENABLED_STATIC(TUCKER) - LINK_PLUGIN(TUCKER) - #endif + #include "engines/plugins_table.h" // Music plugins // TODO: Use defines to disable or enable each MIDI driver as a @@ -205,6 +101,9 @@ public: #if defined(USE_SEQ_MIDI) LINK_PLUGIN(SEQ) #endif + #if defined(USE_SNDIO) + LINK_PLUGIN(SNDIO) + #endif #if defined(__MINT__) LINK_PLUGIN(STMIDI) #endif |