[Scummvm-cvs-logs] CVS: scummvm-new Makefile.common,1.8,1.9

[Max Horn]

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

Modified Files:
	Makefile.common 
Log Message:
fixed the Makefile buildsystem for now to link in the new Smush player, and disabling the old Smush player

Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/Makefile.common,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.common	23 Aug 2002 06:43:06 -0000	1.8
+++ Makefile.common	24 Aug 2002 16:26:09 -0000	1.9
@@ -17,14 +17,31 @@
 
 SCUMM_OBJS = scumm/actor.o scumm/akos.o scumm/boxes.o scumm/bundle.o \
 	scumm/costume.o scumm/debug.o scumm/debugrl.o scumm/gfx.o scumm/imuse.o \
-	scumm/insane.o scumm/object.o scumm/resource.o scumm/resource_v3.o \
+	scumm/object.o scumm/resource.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/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 \
 	simon/sys.o simon/verb.o simon/vga.o
 
+SMUSH_OBJS = scumm/smush/blitter.o \
+	scumm/smush/brenderer.o \
+	scumm/smush/chunck.o \
+	scumm/smush/codec1.o \
+	scumm/smush/codec37.o \
+	scumm/smush/codec44.o \
+	scumm/smush/codec47.o \
+	scumm/smush/color.o \
+	scumm/smush/frenderer.o \
+	scumm/smush/imuse_channel.o \
+	scumm/smush/palette.o \
+	scumm/smush/player.o \
+	scumm/smush/rect.o \
+	scumm/smush/saud_channel.o \
+	scumm/smush/scumm_renderer.o
+
 SOUND_OBJS = sound/fmopl.o sound/mididrv.o sound/mixer.o sound/sound.o
 
 OBJS	+= $(COMMON_OBJS) $(GUI_OBJS) scumm/libscumm.a simon/libsimon.a $(SOUND_OBJS)
@@ -38,7 +55,7 @@
 scummvm$(EXEEXT): $(OBJS)
 	$(CXX) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS)
 
-scumm/libscumm.a: $(SCUMM_OBJS)
+scumm/libscumm.a: $(SCUMM_OBJS) $(SMUSH_OBJS)
 	$(AR) $@ $+
 	$(RANLIB) $@