[Scummvm-cvs-logs] CVS: residual Makefile.mingw,1.13,1.14

Travis Howell kirben at users.sourceforge.net
Fri Dec 12 16:33:01 CET 2003


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

Modified Files:
	Makefile.mingw 
Log Message:

Update makefile


Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile.mingw,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile.mingw	12 Dec 2003 08:46:02 -0000	1.13
+++ Makefile.mingw	13 Dec 2003 00:32:13 -0000	1.14
@@ -8,16 +8,16 @@
 CXX = g++
 CXXFLAGS = -g -W -Wall -Ilua/include $(SDL_CFLAGS) # -O2 
 LDFLAGS = -g -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 \
+	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)
 EXEEXT =.exe
 
-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:
@@ -25,14 +25,22 @@
 
 lua/lib/liblua.a lua/lib/liblualib.a: lua-build
 
+mixer/libmixer.a: mixer-build
+
 lua-build:
 	$(MAKE) -C lua
 
+mixer-build:
+	$(MAKE) -C mixer
+
 clean: lua-clean
 	-rm -f residual.exe *.o *.d *~
 
 lua-clean:
 	$(MAKE) -C lua clean
+
+mixer-clean:
+	$(MAKE) -C mixer clean
 
 -include $(DEPS)
 





More information about the Scummvm-git-logs mailing list