[Scummvm-cvs-logs] CVS: residual Makefile.common,NONE,1.1 Makefile,1.17,1.18 Makefile.cross,1.11,1.12 Makefile.mingw,1.19,1.20
Travis Howell
kirben at users.sourceforge.net
Sun Apr 4 19:14:02 CEST 2004
Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv674
Modified Files:
Makefile Makefile.cross Makefile.mingw
Added Files:
Makefile.common
Log Message:
Merge Makefiles a bit
--- NEW FILE: Makefile.common ---
DEPS = $(OBJS:.o=.d)
OBJS =\
actor.o \
bitmap.o \
blocky16.o \
costume.o \
debug.o \
driver_gl.o \
engine.o \
keyframe.o \
lab.o \
localize.o \
lua.o \
main.o \
material.o \
matrix3.o \
matrix4.o \
model.o \
objectstate.o \
registry.o \
resource.o \
scene.o \
screen.o \
smush.o \
sound.o \
textobject.o \
textsplit.o \
timer.o \
vima.o \
walkplane.o \
mixer/mixer.o \
mixer/rate.o \
mixer/audiostream.o
residual: $(OBJS) lua/lib/liblua.a lua/lib/liblualib.a
$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
.cpp.o:
$(CXX) $(CXXFLAGS) -MMD -c $(<) -o $*.o
lua/lib/liblua.a lua/lib/liblualib.a: lua-build
lua-build:
$(MAKE) -C lua
clean: lua-clean
-rm -f residual$(EXEEXT) *.o mixer\*.o *.d mixer\*.d *~
lua-clean:
$(MAKE) -C lua clean
-include $(DEPS)
Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile 25 Mar 2004 22:17:09 -0000 1.17
+++ Makefile 5 Apr 2004 02:00:33 -0000 1.18
@@ -12,31 +12,6 @@
# ... and instead uncomment this if you are on Mac OS X
#CXXFLAGS += -DMACOSX
-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 \
- objectstate.o mixer/mixer.o mixer/rate.o mixer/audiostream.o
-
-DEPS = $(OBJS:.o=.d)
-
-residual: $(OBJS) lua/lib/liblua.a lua/lib/liblualib.a
- $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-
-.cpp.o:
- $(CXX) $(CXXFLAGS) -MMD -c $(<) -o $*.o
-
-lua/lib/liblua.a lua/lib/liblualib.a: lua-build
-
-lua-build:
- $(MAKE) -C lua
-
-clean: lua-clean
- -rm -f residual *.o mixer\*.o *.d mixer\*.d *~
-
-lua-clean:
- $(MAKE) -C lua clean
-
--include $(DEPS)
+include Makefile.common
.PHONY: lua-build lua-clean
Index: Makefile.cross
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile.cross,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile.cross 22 Feb 2004 07:58:57 -0000 1.11
+++ Makefile.cross 5 Apr 2004 02:00:33 -0000 1.12
@@ -3,35 +3,12 @@
SDL_LIBS=-L/usr/i586-mingw32msvc/lib -lSDL
CXX = i586-mingw32msvc-g++
-CXXFLAGS = -W -Wall -Ilua/include $(SDL_CFLAGS) # -O2
+CXXFLAGS = -W -Wall -Wno-multichar -Ilua/include $(SDL_CFLAGS) # -O2
LDFLAGS = -W -Wall # -O2
LIBS = -Llua/lib -llua -llualib -lmingw32 -lopengl32 -lglu32 -lgdi32 \
$(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 \
- mixer/mixer.o mixer/rate.o mixer/audiostream.o
-DEPS = $(OBJS:.o=.d)
-
-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 $(<) -o $*.o
-
-lua/lib/liblua.a lua/lib/liblualib.a: lua-build
-
-lua-build:
- $(MAKE) -C lua
-
-clean: lua-clean
- -rm -f residual.exe *.o mixer\*.o *.d mixer\*.d *~
-
-lua-clean:
- $(MAKE) -C lua clean
+EXEEXT =.exe
--include $(DEPS)
+include Makefile.common
.PHONY: lua-build lua-clean
Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile.mingw,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Makefile.mingw 23 Mar 2004 05:49:51 -0000 1.19
+++ Makefile.mingw 5 Apr 2004 02:00:33 -0000 1.20
@@ -2,40 +2,17 @@
RESIDUALPATH=C:/residual
### Modify these paths
-SDL_CFLAGS=-I$(SRC)sdl/include
-SDL_LIBS=-L$(SRC)sdl/lib -lSDL
+SDL_CFLAGS=`sdl-config --cflags`
+SDL_LIBS=`sdl-config --libs`
CXX = g++
-CXXFLAGS = -g -W -Wall -Ilua/include $(SDL_CFLAGS) # -O2
+CXXFLAGS = -g -W -Wall -Wno-multichar -Ilua/include $(SDL_CFLAGS) # -O2
LDFLAGS = -g -W -Wall # -O2
LIBS = -Llua/lib -llua -llualib -lmingw32 -lopengl32 -lglu32 -lgdi32 \
$(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 \
- objectstate.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
- $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-
-.cpp.o:
- $(CXX) $(CXXFLAGS) -MMD -c $(<) -o $*.o
-
-lua/lib/liblua.a lua/lib/liblualib.a: lua-build
-
-lua-build:
- $(MAKE) -C lua
-
-clean: lua-clean
- -rm -f residual.exe *.o mixer\*.o *.d mixer\*.d *~
-
-lua-clean:
- $(MAKE) -C lua clean
-
--include $(DEPS)
+include Makefile.common
.PHONY: lua-build lua-clean
More information about the Scummvm-git-logs
mailing list