diff options
| author | Neeraj Kumar | 2010-08-06 20:13:41 +0000 |
|---|---|---|
| committer | Neeraj Kumar | 2010-08-06 20:13:41 +0000 |
| commit | 7e126ed299cb789340cb2f8d409338dbdd6c8235 (patch) | |
| tree | 91f6e4be633fd579922ddf270443011582b8f9ec /base/plugins.cpp | |
| parent | 6c0855f3d3efc52478ba9ce019fbd4c9287f4691 (diff) | |
| parent | 4ae7427eed781613e2cda096d0f61c77883bca05 (diff) | |
| download | scummvm-rg350-7e126ed299cb789340cb2f8d409338dbdd6c8235.tar.gz scummvm-rg350-7e126ed299cb789340cb2f8d409338dbdd6c8235.tar.bz2 scummvm-rg350-7e126ed299cb789340cb2f8d409338dbdd6c8235.zip | |
TESTBED: Merged changes from trunk to my branch
svn-id: r51798
Diffstat (limited to 'base/plugins.cpp')
| -rw-r--r-- | base/plugins.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/base/plugins.cpp b/base/plugins.cpp index feead28247..f82f1d64d2 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -170,14 +170,15 @@ public: // Music plugins // TODO: Use defines to disable or enable each MIDI driver as a // static/dynamic plugin, like it's done for the engines + LINK_PLUGIN(AUTO) LINK_PLUGIN(NULL) #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__) LINK_PLUGIN(WINDOWS) #endif - #if defined(UNIX) && defined(USE_ALSA) + #if defined(USE_ALSA) LINK_PLUGIN(ALSA) #endif - #if defined(UNIX) && !defined(__BEOS__) && !defined(__MAEMO__) && !defined(__MINT__) + #if defined(USE_SEQ_MIDI) LINK_PLUGIN(SEQ) #endif #if defined(__MINT__) @@ -193,13 +194,6 @@ public: LINK_PLUGIN(COREAUDIO) LINK_PLUGIN(COREMIDI) #endif - #if defined(PALMOS_MODE) - # if defined(COMPILE_CLIE) - LINK_PLUGIN(YPA1) - # elif defined(COMPILE_ZODIAC) && (!defined(ENABLE_SCUMM) || !defined(PALMOS_ARM)) - LINK_PLUGIN(ZODIAC) - # endif - #endif #ifdef USE_FLUIDSYNTH LINK_PLUGIN(FLUIDSYNTH) #endif @@ -207,6 +201,8 @@ public: LINK_PLUGIN(MT32) #endif LINK_PLUGIN(ADLIB) + LINK_PLUGIN(PCSPK) + LINK_PLUGIN(PCJR) LINK_PLUGIN(TOWNS) #if defined (UNIX) LINK_PLUGIN(TIMIDITY) |