diff options
| author | Max Horn | 2008-01-13 17:05:43 +0000 |
|---|---|---|
| committer | Max Horn | 2008-01-13 17:05:43 +0000 |
| commit | 696ea9d301cae1f2a123c37ddaa7490544cd99a0 (patch) | |
| tree | 7ac7d9a83c250ce1abaec2d2cea030d73467e7cd /Makefile.common | |
| parent | 79e1579cb3119a70677f7c7c158c5e7686b65f6d (diff) | |
| download | scummvm-rg350-696ea9d301cae1f2a123c37ddaa7490544cd99a0.tar.gz scummvm-rg350-696ea9d301cae1f2a123c37ddaa7490544cd99a0.tar.bz2 scummvm-rg350-696ea9d301cae1f2a123c37ddaa7490544cd99a0.zip | |
Various small patches to the build system by jvprat
svn-id: r30473
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Makefile.common b/Makefile.common index 4852906c02..965f73dd42 100644 --- a/Makefile.common +++ b/Makefile.common @@ -79,7 +79,7 @@ clean: ifndef HAVE_GCC3 # If you use GCC, disable the above and enable this for intelligent # dependency tracking. -.cpp.o: +%.o: %.cpp $(MKDIR) $(*D)/$(DEPDIR) $(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d2" $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o $(ECHO) "$(*D)/" > $(*D)/$(DEPDIR)/$(*F).d @@ -90,18 +90,16 @@ else # 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: +%.o: %.cpp $(MKDIR) $(*D)/$(DEPDIR) $(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o -.m.o: +%.o: %.m $(MKDIR) $(*D)/$(DEPDIR) $(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(OBJCFLAGS) -c $(<) -o $*.o endif ifdef HAVE_NASM -.SUFFIXES: .asm - -.asm.o: +%.o: %.asm $(NASM) -O1 $(NASMFLAGS) -g -o $*.o $(<) endif |