[Scummvm-cvs-logs] CVS: residual Makefile,1.12,1.13 Makefile.cross,1.10,1.11 Makefile.mingw,1.16,1.17

Pawel Kolodziejski aquadran at users.sourceforge.net
Sun Feb 22 00:12:01 CET 2004


Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24187

Modified Files:
	Makefile Makefile.cross Makefile.mingw 
Log Message:
all build files in main makefile

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile	28 Jan 2004 08:09:12 -0000	1.12
+++ Makefile	22 Feb 2004 07:58:57 -0000	1.13
@@ -1,40 +1,35 @@
 CXX = g++
+CC = gcc
+AR = ar rcu
 CXXFLAGS = -g -W -Wall -Ilua/include `sdl-config --cflags` -DUNIX # -O2
 LDFLAGS = -g -W -Wall # -O2
 LIBS =  -Llua/lib -llua -llualib `sdl-config --libs` \
-	-Lmixer -lmixer -lGL -lGLU -lz
+	-lGL -lGLU -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 driver_gl.o
+	matrix3.o matrix4.o screen.o blocky16.o smush.o vima.o driver_gl.o \
+	mixer/mixer.o mixer/rate.o mixer/audiostream.o
 
 DEPS = $(OBJS:.o=.d)
 
-residual: $(OBJS) lua/lib/liblua.a lua/lib/liblualib.a mixer/libmixer.a
+residual: $(OBJS) lua/lib/liblua.a lua/lib/liblualib.a
 	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
 .cpp.o:
-	$(CXX) $(CXXFLAGS) -MMD -c $<
+	$(CXX) $(CXXFLAGS) -MMD -c $(<) -o $*.o
 
 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 mixer-clean
-	-rm -f residual *.o *.d *~
+clean: lua-clean
+	-rm -f residual *.o mixer\*.o *.d mixer\*.d *~
 
 lua-clean:
 	$(MAKE) -C lua clean
 
-mixer-clean:
-	$(MAKE) -C mixer clean
-
 -include $(DEPS)
 
-.PHONY: lua-build lua-clean mixer-build mixer-clean
+.PHONY: lua-build lua-clean

Index: Makefile.cross
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile.cross,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile.cross	31 Jan 2004 03:14:43 -0000	1.10
+++ Makefile.cross	22 Feb 2004 07:58:57 -0000	1.11
@@ -1,42 +1,37 @@
-CXX = i586-mingw32msvc-g++
+### Modify these paths if needed
 SDL_CFLAGS=-I/usr/i586-mingw32msvc/include/SDL
 SDL_LIBS=-L/usr/i586-mingw32msvc/lib -lSDL
 
-CXXFLAGS = -W -Wall -Ilua/include $(SDL_CFLAGS) # -O2 
-LDFLAGS = -W -Wall # -O2 
+CXX = i586-mingw32msvc-g++
+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) -lz
+	$(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 driver_gl.o
+	matrix3.o matrix4.o screen.o blocky16.o smush.o vima.o driver_gl.o \
+	mixer/mixer.o mixer/rate.o mixer/audiostream.o
 DEPS = $(OBJS:.o=.d)
 
-residual: $(OBJS) lua/lib/liblua.a lua/lib/liblualib.a mixer/libmixer.a
+residual: $(OBJS) lua/lib/liblua.a lua/lib/liblualib.a
 	$(CXX) $(LDFLAGS) -o residual.exe $(OBJS) $(LIBS)
+	strip residual.exe
 
 .cpp.o:
-	$(CXX) $(CXXFLAGS) -MMD -c $<
+	$(CXX) $(CXXFLAGS) -MMD -c $(<) -o $*.o
 
 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 mixer-clean
-	-rm -f residual.exe *.o *.d *~
+clean: lua-clean
+	-rm -f residual.exe *.o mixer\*.o *.d mixer\*.d *~
 
 lua-clean:
 	$(MAKE) -C lua clean
 
-mixer-clean:
-	$(MAKE) -C mixer clean
-
 -include $(DEPS)
 
-.PHONY: lua-build lua-clean mixer-build mixer-clean
+.PHONY: lua-build lua-clean

Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile.mingw,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile.mingw	31 Jan 2004 03:14:43 -0000	1.16
+++ Makefile.mingw	22 Feb 2004 07:58:57 -0000	1.17
@@ -9,42 +9,35 @@
 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) -lz
+	$(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 driver_gl.o
+	matrix3.o matrix4.o screen.o blocky16.o smush.o vima.o driver_gl.o \
+	mixer/mixer.o mixer/rate.o mixer/audiostream.o
 DEPS = $(OBJS:.o=.d)
 EXEEXT =.exe
 
-residual: $(OBJS) lua/lib/liblua.a lua/lib/liblualib.a mixer/libmixer.a
+residual: $(OBJS) lua/lib/liblua.a lua/lib/liblualib.a
 	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
 .cpp.o:
-	$(CXX) $(CXXFLAGS) -MMD -c $<
+	$(CXX) $(CXXFLAGS) -MMD -c $(<) -o $*.o
 
 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 mixer-clean
-	-rm -f residual.exe *.o *.d *~
+clean: lua-clean
+	-rm -f residual.exe *.o mixer\*.o *.d mixer\*.d *~
 
 lua-clean:
 	$(MAKE) -C lua clean
 
-mixer-clean:
-	$(MAKE) -C mixer clean
-
 -include $(DEPS)
 
-.PHONY: lua-build lua-clean mixer-build mixer-clean
+.PHONY: lua-build lua-clean
 
 # Some additional targets
 install:   residual





More information about the Scummvm-git-logs mailing list