diff options
| author | Matthew Hoops | 2012-05-25 00:21:51 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-05-25 00:35:38 -0400 |
| commit | f1f6a82cd57fceb52afdd393f44a80c40f3c9a15 (patch) | |
| tree | 06a04072df44bd5f337ff79b43684d8109a72f59 /base | |
| parent | b2506abccf6aa64da31b497b45fe0e1949530053 (diff) | |
| parent | beef27fc10bb714fe37f2ee0c35cd143dc706829 (diff) | |
| download | scummvm-rg350-f1f6a82cd57fceb52afdd393f44a80c40f3c9a15.tar.gz scummvm-rg350-f1f6a82cd57fceb52afdd393f44a80c40f3c9a15.tar.bz2 scummvm-rg350-f1f6a82cd57fceb52afdd393f44a80c40f3c9a15.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'base')
| -rw-r--r-- | base/plugins.cpp | 3 | ||||
| -rw-r--r-- | base/version.cpp | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/base/plugins.cpp b/base/plugins.cpp index c19b60782d..b8cd097683 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -101,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 diff --git a/base/version.cpp b/base/version.cpp index 7943552418..89fae90c2e 100644 --- a/base/version.cpp +++ b/base/version.cpp @@ -94,6 +94,10 @@ const char *gScummVMFeatures = "" "SEQ " #endif +#ifdef USE_SNDIO + "sndio " +#endif + #ifdef USE_TIMIDITY "TiMidity " #endif |