[Scummvm-cvs-logs] CVS: residual Makefile,1.8,1.9

[Jonathan Gray]

Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1:/tmp/cvs-serv1958

Modified Files:
	Makefile 
Log Message:
hack makefile to compile again, how can this be done cleaner?

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile	12 Dec 2003 09:53:29 -0000	1.8
+++ Makefile	12 Dec 2003 23:06:19 -0000	1.9
@@ -1,15 +1,16 @@
 CXX = g++
 CXXFLAGS = -g -W -Wall -Ilua/include `sdl-config --cflags` -DUNIX # -O2
 LDFLAGS = -g -W -Wall # -O2
-LIBS = -lSDL -lGL -lGLU -Llua/lib -llua -llualib `sdl-config --libs`
+LIBS = -lSDL -lGL -lGLU -Llua/lib -llua -llualib `sdl-config --libs` \
+	-Lmixer -lmixer
 OBJS = main.o lab.o bitmap.o model.o resource.o material.o debug.o \
 	textsplit.o lua.o registry.o localize.o scene.o engine.o actor.o \
-	sound.o mixer.o keyframe.o costume.o walkplane.o textobject.o \
+	sound.o timer.o keyframe.o costume.o walkplane.o textobject.o \
 	matrix3.o matrix4.o screen.o blocky16.o smush.o vima.o
 
 DEPS = $(OBJS:.o=.d)
 
-residual: $(OBJS) lua/lib/liblua.a lua/lib/liblualib.a
+residual: $(OBJS) lua/lib/liblua.a lua/lib/liblualib.a mixer/libmixer.a
 	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
 .cpp.o:
@@ -17,15 +18,23 @@
 
 lua/lib/liblua.a lua/lib/liblualib.a: lua-build
 
+mixer/libmixer.a: mixer-build
+
 lua-build:
 	$(MAKE) -C lua
 
-clean: lua-clean
+mixer-build:
+	$(MAKE) -C mixer
+
+clean: lua-clean mixer-clean
 	-rm -f residual *.o *.d *~
 
 lua-clean:
 	$(MAKE) -C lua clean
 
+mixer-clean:
+	$(MAKE) -C mixer clean
+
 -include $(DEPS)
 
-.PHONY: lua-build lua-clean
+.PHONY: lua-build lua-clean mixer-build mixer-clean