diff options
| author | Max Horn | 2002-11-21 05:10:30 +0000 |
|---|---|---|
| committer | Max Horn | 2002-11-21 05:10:30 +0000 |
| commit | 949716c08a78f76452586af7127aea582c0bec04 (patch) | |
| tree | 1ad6d4b3c6f52c8daa34355b2a74602133857c00 | |
| parent | 305cf16437a909e83b52ffc24a9c9ad866cd0745 (diff) | |
| download | scummvm-rg350-949716c08a78f76452586af7127aea582c0bec04.tar.gz scummvm-rg350-949716c08a78f76452586af7127aea582c0bec04.tar.bz2 scummvm-rg350-949716c08a78f76452586af7127aea582c0bec04.zip | |
oops - default to gcc 2.9x build rules, not gcc 3.x build rules
svn-id: r5656
| -rw-r--r-- | Makefile.common | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Makefile.common b/Makefile.common index 8ccbb757ed..7bcf8c679b 100644 --- a/Makefile.common +++ b/Makefile.common @@ -50,18 +50,18 @@ clean: DEPDIRS = $(patsubst %,%/$(DEPDIR),$(MODULES)) DEPFILES = $(wildcard $(patsubst %,%/*.d,$(DEPDIRS))) -#.cpp.o: -# $(MKDIR) $(*D)/$(DEPDIR) -# $(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d2" $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o -# $(ECHO) "$(*D)/" > $(*D)/$(DEPDIR)/$(*F).d -# $(CAT) "$(*D)/$(DEPDIR)/$(*F).d2" >> "$(*D)/$(DEPDIR)/$(*F).d" -# $(RM) "$(*D)/$(DEPDIR)/$(*F).d2" +.cpp.o: + $(MKDIR) $(*D)/$(DEPDIR) + $(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d2" $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o + $(ECHO) "$(*D)/" > $(*D)/$(DEPDIR)/$(*F).d + $(CAT) "$(*D)/$(DEPDIR)/$(*F).d2" >> "$(*D)/$(DEPDIR)/$(*F).d" + $(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. -.cpp.o: - $(MKDIR) $(*D)/$(DEPDIR) - $(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o +#.cpp.o: +# $(MKDIR) $(*D)/$(DEPDIR) +# $(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o -include $(DEPFILES) /dev/null |