[Scummvm-cvs-logs] CVS: scummvm Makefile.common,1.91,1.92 configure,1.105,1.106

Eugene Sandulenko sev at users.sourceforge.net
Fri Nov 5 17:48:14 CET 2004


Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27409

Modified Files:
	Makefile.common configure 
Log Message:
Major MT-32 emu overhaul based on KingGuppy's code.
 o added configure option
 o mi2 intro doesn't freeze anymore and has no sound glitches
 o missing instruments in many titles are fixed
 o numerous memory overwrite bugs are fixed
 o code is cleaned a lot and splitted into many smaller files
 o mt32.cpp went to backends/midi
 o synced with upstream code
 o reverberation fixed

 * don't complain about File class wrapper :)
 * all custom types are back
 * #pragmas are to do
 * maybe some indentation is wrong too

I prefer smaller commits, but this thing came in one piece.


Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.common,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- Makefile.common	22 Aug 2004 21:39:49 -0000	1.91
+++ Makefile.common	6 Nov 2004 01:41:28 -0000	1.92
@@ -89,6 +89,9 @@
 	sound \
 	common
 
+ifdef USE_MT32EMU
+MODULES += backends/midi/mt32
+endif
 
 ######################################################################
 # The build rules follow - normally you should have no need to

Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- configure	23 Oct 2004 13:55:23 -0000	1.105
+++ configure	6 Nov 2004 01:41:29 -0000	1.106
@@ -20,6 +20,7 @@
 _alsa=auto
 _zlib=auto
 _mpeg2=auto
+_mt32emu=yes
 # default option behaviour yes/no
 _build_scumm=yes
 _build_simon=yes
@@ -269,6 +270,7 @@
   --enable-kyra            build the Legend of Kyrandia engine
   --enable-plugins         build engines as loadable modules instead of
                            static linking them
+  --disable-mt32emu        don't enable the integrated MT-32 emulator
 
 Optional Libraries:
   --with-alsa-prefix=DIR   Prefix where alsa is installed (optional)
@@ -334,6 +336,8 @@
       --disable-nasm)		_nasm=no	;;
       --disable-mpeg2)          _mpeg2=no       ;;
       --enable-plugins)         _build_plugins=yes ;;
+      --enable-mt32emu)         _mt32emu=yes    ;;
+      --disable-mt32emu)        _mt32emu=no     ;;
       --with-mpeg2-prefix=*)
 	_prefix=`echo $ac_option | cut -d '=' -f 2`
 	MPEG2_CFLAGS="-I$_prefix/include"
@@ -783,6 +787,19 @@
 fi
 echo "$_build_plugins"
 
+
+#
+# Check whether integrated MT-32 emulator support is requested
+#
+if test "$_mt32emu" = no ; then
+  _def_mt32emu='#undef USE_MT32EMU'
+  _mak_mt32emu='# USE_MT32EMU = 1'
+else
+  _def_mt32emu='#define USE_MT32EMU'
+  _mak_mt32emu='USE_MT32EMU = 1'
+  INCLUDES="$INCLUDES -I\$(srcdir)/backends/midi/mt32"
+fi
+
 #
 # Check for Ogg Vorbis
 #
@@ -1058,8 +1075,9 @@
 $_def_alsa
 $_def_zlib
 $_def_mpeg2
+$_def_mt32emu
 
-/* Should we use i386 assembly routines */
+/* Whether we should use i386 assembly routines */
 $_def_nasm
 
 #endif /* CONFIG_H */
@@ -1106,6 +1124,7 @@
 $_mak_queen
 $_mak_kyra
 $_mak_saga
+$_mak_mt32emu
 
 INCLUDES += $INCLUDES
 OBJS += $OBJS





More information about the Scummvm-git-logs mailing list