Midi support.

icculus · Jan 4, 2002 · b411d7a · b411d7a
1 parent 058d546
commit b411d7a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -13,14 +13,20 @@ libSDL_sound_la_SOURCES =	\
 	extra_rwops.h	\
 	audio_convert.c
 
+if USE_TIMIDITY
+TIMIDITY_LIB = decoders/timidity/libtimidity.la
+else
+TIMIDITY_LIB =
+endif
+
 libSDL_sound_la_LDFLAGS = 		\
 	-release $(LT_RELEASE)	\
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-libSDL_sound_la_LIBADD = decoders/libdecoders.la
-
+libSDL_sound_la_LIBADD =	\
+	decoders/libdecoders.la	\
+	$(TIMIDITY_LIB)
 
 EXTRA_DIST =	\
 	CREDITS \
 	COPYING \
 	CHANGELOG
-
diff --git a/configure.in b/configure.in
@@ -137,8 +137,8 @@ fi
 
 dnl Check for the MIDI pipe decoder...
 AC_ARG_ENABLE(midi,
-[  --enable-midi              enable MIDI music via a pipe [default=no]],
-              , enable_midi=no)
+[  --enable-midi              enable software MIDI music [default=yes]],
+              , enable_midi=yes)
 if test x$enable_midi = xyes; then
   AC_DEFINE(SOUND_SUPPORTS_MIDI)
 fi
@@ -221,9 +221,12 @@ AC_TYPE_SIZE_T
 AC_FUNC_MEMCMP
 AC_CHECK_FUNCS([memset strrchr])
 
+dnl Add Makefile conditionals
+AM_CONDITIONAL(USE_TIMIDITY, test x$enable_midi = xyes)
 
 AC_OUTPUT([
 Makefile
 decoders/Makefile
+decoders/timidity/Makefile
 test/Makefile
 ])
diff --git a/decoders/Makefile.am b/decoders/Makefile.am
@@ -1,14 +1,16 @@
 noinst_LTLIBRARIES = libdecoders.la
 
-INCLUDES = -I$(top_srcdir)
+SUBDIRS = timidity
+
+INCLUDES = -I$(top_srcdir) -Itimidity
 
 libdecoders_la_SOURCES =	\
 	aiff.c		\
 	mod.c		\
 	mp3.c		\
 	ogg.c		\
 	raw.c		\
-    shn.c		\
+	shn.c		\
 	voc.c		\
 	midi.c		\
 	flac.c		\