[Scummvm-cvs-logs] CVS: residual Makefile.cross,1.9,1.10 Makefile.mingw,1.15,1.16
Travis Howell
kirben at users.sourceforge.net
Fri Jan 30 19:22:16 CET 2004
Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13606
Modified Files:
Makefile.cross Makefile.mingw
Log Message:
Update mingw Makefiles
Index: Makefile.cross
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile.cross,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.cross 13 Dec 2003 09:38:52 -0000 1.9
+++ Makefile.cross 31 Jan 2004 03:14:43 -0000 1.10
@@ -5,11 +5,11 @@
CXXFLAGS = -W -Wall -Ilua/include $(SDL_CFLAGS) # -O2
LDFLAGS = -W -Wall # -O2
LIBS = -Llua/lib -llua -llualib -lmingw32 -lopengl32 -lglu32 -lgdi32 \
- -Lmixer -lmixer $(SDL_LIBS)
+ -Lmixer -lmixer $(SDL_LIBS) -lz
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 timer.o keyframe.o costume.o walkplane.o textobject.o \
- matrix3.o matrix4.o screen.o blocky16.o smush.o vima.o
+ matrix3.o matrix4.o screen.o blocky16.o smush.o vima.o driver_gl.o
DEPS = $(OBJS:.o=.d)
residual: $(OBJS) lua/lib/liblua.a lua/lib/liblualib.a mixer/libmixer.a
Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile.mingw,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile.mingw 13 Dec 2003 09:38:52 -0000 1.15
+++ Makefile.mingw 31 Jan 2004 03:14:43 -0000 1.16
@@ -9,11 +9,11 @@
CXXFLAGS = -g -W -Wall -Ilua/include $(SDL_CFLAGS) # -O2
LDFLAGS = -g -W -Wall # -O2
LIBS = -Llua/lib -llua -llualib -lmingw32 -lopengl32 -lglu32 -lgdi32 \
- -Lmixer -lmixer $(SDL_LIBS)
+ -Lmixer -lmixer $(SDL_LIBS) -lz
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 timer.o keyframe.o costume.o walkplane.o textobject.o \
- matrix3.o matrix4.o screen.o blocky16.o smush.o vima.o
+ matrix3.o matrix4.o screen.o blocky16.o smush.o vima.o driver_gl.o
DEPS = $(OBJS:.o=.d)
EXEEXT =.exe
More information about the Scummvm-git-logs
mailing list