[Scummvm-cvs-logs] CVS: scummvm Makefile.common,1.54,1.55
Max Horn
fingolfin at users.sourceforge.net
Thu Jul 31 11:44:17 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm bs2.vcproj,1.3,1.4 scumm.vcproj,1.2,1.3 scummvm.vcproj,1.5,1.6 simon.vcproj,1.2,1.3 sky.vcproj,1.2,1.3
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/wince/scummvm scummvm.vcp,1.10,1.10.2.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1:/tmp/cvs-serv13469
Modified Files:
Makefile.common
Log Message:
fix for bug #780989 (make distclean left some .deps dirs)
Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.common,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- Makefile.common 30 Jul 2003 20:01:26 -0000 1.54
+++ Makefile.common 31 Jul 2003 18:41:05 -0000 1.55
@@ -27,7 +27,7 @@
ifdef DISABLE_SCUMM
DEFINES += -DDISABLE_SCUMM
else
-MODULES += scumm
+MODULES += scumm scumm/smush
endif
ifdef DISABLE_SIMON
@@ -39,13 +39,13 @@
ifdef DISABLE_SKY
DEFINES += -DDISABLE_SKY
else
-MODULES += sky
+MODULES += sky sky/compacts sky/music
endif
ifdef DISABLE_SWORD2
DEFINES += -DDISABLE_SWORD2
else
-MODULES += bs2
+MODULES += bs2 bs2/driver
endif
MODULES += \
@@ -53,7 +53,6 @@
gui \
backends \
sound \
- scumm/smush \
backends/fs/posix \
backends/fs/morphos \
backends/fs/windows \
@@ -101,7 +100,9 @@
$(RM) "$(*D)/$(DEPDIR)/$(*F).d2"
# If you even have GCC 3.x, you can use this build rule, which is safer; the above
-# rule can get you into a bad state if you Ctrl-C it in the wrong moment.
+# rule can get you into a bad state if you Ctrl-C at the wrong moment.
+# Also, with this GCC inserts additional dummy rules for the involved headers,
+# which ensures a smooth compilation even if said headers become obsolete.
#.cpp.o:
# $(MKDIR) $(*D)/$(DEPDIR)
# $(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
- Previous message: [Scummvm-cvs-logs] CVS: scummvm bs2.vcproj,1.3,1.4 scumm.vcproj,1.2,1.3 scummvm.vcproj,1.5,1.6 simon.vcproj,1.2,1.3 sky.vcproj,1.2,1.3
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/wince/scummvm scummvm.vcp,1.10,1.10.2.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list