[Scummvm-cvs-logs] CVS: scummvm Makefile.common,1.14,1.15

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv18651

Modified Files:
	Makefile.common 
Log Message:
sound system cleanup

Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.common,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile.common	29 Aug 2002 16:57:42 -0000	1.14
+++ Makefile.common	29 Aug 2002 23:45:14 -0000	1.15
@@ -19,8 +19,8 @@
 	scumm/costume.o scumm/debug.o scumm/debugrl.o scumm/gfx.o scumm/imuse.o \
 	scumm/object.o scumm/resource.o scumm/resource_v2.o scumm/resource_v3.o \
 	scumm/resource_v4.o scumm/saveload.o scumm/script.o \
-	scumm/script_v1.o scumm/script_v2.o scumm/scummvm.o scumm/string.o \
-	scumm/sys.o scumm/vars.o scumm/verbs.o \
+	scumm/script_v1.o scumm/script_v2.o scumm/scummvm.o  scumm/sound.o \
+	scumm/string.o scumm/sys.o scumm/vars.o scumm/verbs.o \
 #	scumm/insane.o
 
 SIMON_OBJS = simon/debug.o simon/items.o simon/midi.o simon/res.o simon/simon.o \
@@ -40,7 +40,7 @@
 	scumm/smush/saud_channel.o \
 	scumm/smush/scumm_renderer.o
 
-SOUND_OBJS = sound/fmopl.o sound/mididrv.o sound/mixer.o sound/sound.o
+SOUND_OBJS = sound/fmopl.o sound/mididrv.o sound/mixer.o
 
 OBJS	+= $(COMMON_OBJS) $(GUI_OBJS) scumm/libscumm.a simon/libsimon.a $(SOUND_OBJS)