[Scummvm-cvs-logs] SF.net SVN: scummvm:[53395] scummvm/trunk

[lordhoto at users.sourceforge.net]

Revision: 53395
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53395&view=rev
Author:   lordhoto
Date:     2010-10-13 00:48:40 +0000 (Wed, 13 Oct 2010)

Log Message:
-----------
SOUND: Allow TiMidity support to be disabled via configure.

Modified Paths:
--------------
    scummvm/trunk/backends/midi/timidity.cpp
    scummvm/trunk/base/plugins.cpp
    scummvm/trunk/configure

Modified: scummvm/trunk/backends/midi/timidity.cpp
===================================================================
--- scummvm/trunk/backends/midi/timidity.cpp	2010-10-13 00:17:20 UTC (rev 53394)
+++ scummvm/trunk/backends/midi/timidity.cpp	2010-10-13 00:48:40 UTC (rev 53395)
@@ -34,8 +34,10 @@
  *
  */
 
-#if defined (UNIX)
+#include "common/scummsys.h"
 
+#if defined(USE_TIMIDITY)
+
 #include "common/util.h"
 #include "common/endian.h"
 #include "common/str.h"

Modified: scummvm/trunk/base/plugins.cpp
===================================================================
--- scummvm/trunk/base/plugins.cpp	2010-10-13 00:17:20 UTC (rev 53394)
+++ scummvm/trunk/base/plugins.cpp	2010-10-13 00:48:40 UTC (rev 53395)
@@ -219,7 +219,7 @@
 		LINK_PLUGIN(AMIGA)
 		LINK_PLUGIN(APPLEIIGS)
 		LINK_PLUGIN(TOWNS)
-		#if defined (UNIX)
+		#if defined(USE_TIMIDITY)
 		LINK_PLUGIN(TIMIDITY)
 		#endif
 

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2010-10-13 00:17:20 UTC (rev 53394)
+++ scummvm/trunk/configure	2010-10-13 00:48:40 UTC (rev 53395)
@@ -124,6 +124,7 @@
 _mad=auto
 _alsa=auto
 _seq_midi=auto
+_timidity=auto
 _zlib=auto
 _mpeg2=no
 _png=auto
@@ -782,6 +783,8 @@
 	--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 @@
 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"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.