[Scummvm-cvs-logs] CVS: residual Makefile.cross,1.8,1.9 Makefile.mingw,1.14,1.15

[Travis Howell]

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

Modified Files:
	Makefile.cross Makefile.mingw 
Log Message:

Update


Index: Makefile.cross
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile.cross,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.cross	12 Dec 2003 08:53:30 -0000	1.8
+++ Makefile.cross	13 Dec 2003 09:38:52 -0000	1.9
@@ -4,15 +4,15 @@
 
 CXXFLAGS = -W -Wall -Ilua/include $(SDL_CFLAGS) # -O2 
 LDFLAGS = -W -Wall # -O2 
-LIBS = -Llua/lib -llua -llualib -lmingw32 -lopengl32 -lglu32 -lgdi32 $(SDL_LIBS) 
-
+LIBS = -Llua/lib -llua -llualib -lmingw32 -lopengl32 -lglu32 -lgdi32 \
+	-Lmixer -lmixer $(SDL_LIBS)
 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 \
-        matrix3.o matrix4.o screen.o blocky16.o smush.o vima.o
+	textsplit.o lua.o registry.o localize.o scene.o engine.o actor.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 residual.exe $(OBJS) $(LIBS)
 
 .cpp.o:
@@ -20,15 +20,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.exe *.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

Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile.mingw,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile.mingw	13 Dec 2003 00:32:13 -0000	1.14
+++ Makefile.mingw	13 Dec 2003 09:38:52 -0000	1.15
@@ -33,7 +33,7 @@
 mixer-build:
 	$(MAKE) -C mixer
 
-clean: lua-clean
+clean: lua-clean mixer-clean
 	-rm -f residual.exe *.o *.d *~
 
 lua-clean:
@@ -44,7 +44,7 @@
 
 -include $(DEPS)
 
-.PHONY: lua-build lua-clean
+.PHONY: lua-build lua-clean mixer-build mixer-clean
 
 # Some additional targets
 install:   residual