diff options
| author | Johannes Schickel | 2010-10-13 00:48:40 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-10-13 00:48:40 +0000 |
| commit | 3b81a9489eabad1faa6c67bb0d5685d7a3eb0386 (patch) | |
| tree | 9bd0ff94ff779182d2b7ab565b0d9aed10ccff39 | |
| parent | eb66750137c1f32276ed4d66512deca2ee6aae93 (diff) | |
| download | scummvm-rg350-3b81a9489eabad1faa6c67bb0d5685d7a3eb0386.tar.gz scummvm-rg350-3b81a9489eabad1faa6c67bb0d5685d7a3eb0386.tar.bz2 scummvm-rg350-3b81a9489eabad1faa6c67bb0d5685d7a3eb0386.zip | |
SOUND: Allow TiMidity support to be disabled via configure.
svn-id: r53395
| -rw-r--r-- | backends/midi/timidity.cpp | 4 | ||||
| -rw-r--r-- | base/plugins.cpp | 2 | ||||
| -rwxr-xr-x | configure | 16 |
3 files changed, 20 insertions, 2 deletions
diff --git a/backends/midi/timidity.cpp b/backends/midi/timidity.cpp index f507f1e00a..16c1cc43be 100644 --- a/backends/midi/timidity.cpp +++ b/backends/midi/timidity.cpp @@ -34,7 +34,9 @@ * */ -#if defined (UNIX) +#include "common/scummsys.h" + +#if defined(USE_TIMIDITY) #include "common/util.h" #include "common/endian.h" diff --git a/base/plugins.cpp b/base/plugins.cpp index 382f9d3c32..e2af9328a7 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -219,7 +219,7 @@ public: LINK_PLUGIN(AMIGA) LINK_PLUGIN(APPLEIIGS) LINK_PLUGIN(TOWNS) - #if defined (UNIX) + #if defined(USE_TIMIDITY) LINK_PLUGIN(TIMIDITY) #endif @@ -124,6 +124,7 @@ _flac=auto _mad=auto _alsa=auto _seq_midi=auto +_timidity=auto _zlib=auto _mpeg2=no _png=auto @@ -782,6 +783,8 @@ for ac_option in $@; do --disable-alsa) _alsa=no ;; --enable-seq-midi) _seq_midi=yes ;; --disable-seq-midi) _seq_midi=no ;; + --enable-timidity) _timidity=yes ;; + --disable-timidity) _timidity=no ;; --enable-vorbis) _vorbis=yes ;; --disable-vorbis) _vorbis=no ;; --enable-tremor) _tremor=yes ;; @@ -2431,6 +2434,19 @@ define_in_config_h_if_yes "$_seq_midi" 'USE_SEQ_MIDI' echo "$_seq_midi" # +# Check for TiMidity(++) +# +echocheck "TiMidity" +if test "$_timidity" = auto ; then + # TODO: Is there a good possibility of auto detecting whether we + # should include TiMidity support? It can only be used on Unix + # currently so we use that as "detection" for now. + _timidity="$_unix" +fi +define_in_config_h_if_yes "$_timidity" 'USE_TIMIDITY' +echo "$_timidity" + +# # Check for ZLib # echocheck "zlib" |