thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some comments

Browse source 
svn-id: r45982
This commit is contained in:
Max Horn 2009-11-18 23:34:40 +00:00
parent 5e56184616
commit 6f45f68a0f
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Makefile.common
View file

@ -116,16 +116,18 @@ else
endif endif
# Build rule for assembler files
%.o: %.s %.o: %.s
$(QUIET)$(MKDIR) $(*D) $(QUIET)$(MKDIR) $(*D)
$(QUIET_AS)$(AS) $(ASFLAGS) $(<) -o $*.o $(QUIET_AS)$(AS) $(ASFLAGS) $(<) -o $*.o
# Build rule for assembler files with preprocessing
%.o: %.S %.o: %.S
$(QUIET)$(MKDIR) $(*D)/$(DEPDIR) $(QUIET)$(MKDIR) $(*D)/$(DEPDIR)
$(QUIET_AS)$(CXX) $(CXX_UPDATE_DEP_FLAG) $(ASFLAGS) -c $(<) -o $*.o $(QUIET_AS)$(CXX) $(CXX_UPDATE_DEP_FLAG) $(ASFLAGS) -c $(<) -o $*.o
ifdef HAVE_NASM ifdef HAVE_NASM
# Build rule for NASM assembler filesss
%.o: %.asm %.o: %.asm
$(QUIET)$(MKDIR) $(*D) $(QUIET)$(MKDIR) $(*D)
$(QUIET_NASM)$(NASM) -O1 $(NASMFLAGS) -g -o $*.o $(<) $(QUIET_NASM)$(NASM) -O1 $(NASMFLAGS) -g -o $*.o $(<)
@ -134,6 +136,9 @@ endif
# Include the dependency tracking files. # Include the dependency tracking files.
-include $(wildcard $(addsuffix /*.d,$(DEPDIRS))) -include $(wildcard $(addsuffix /*.d,$(DEPDIRS)))
# Mark *.d files and most *.mk files as PHONY. This stops make from trying to
# recreate them (which it can't), and in particular from looking for potential
# source files. This can save quite a bit of disk access time.
.PHONY: $(wildcard $(addsuffix /*.d,$(DEPDIRS))) $(addprefix $(srcdir)/, $(addsuffix /module.mk,$(MODULES))) \ .PHONY: $(wildcard $(addsuffix /*.d,$(DEPDIRS))) $(addprefix $(srcdir)/, $(addsuffix /module.mk,$(MODULES))) \
$(srcdir)/$(port_mk) $(srcdir)/rules.mk $(srcdir)/engines/engines.mk $(srcdir)/$(port_mk) $(srcdir)/rules.mk $(srcdir)/engines/engines.mk