diff options
| author | obskyr <powpowd@gmail.com> | 2018-06-18 15:45:28 +0200 |
|---|---|---|
| committer | obskyr <powpowd@gmail.com> | 2018-06-18 15:45:28 +0200 |
| commit | 0cd5e3d610bb13093a1b596e2d5399af1c008a96 (patch) | |
| tree | ebe71f5413b057fa25ea167020f90f70d9572445 /Makefile | |
| parent | f7f29000a85389291798ec5d97b51dc65e7b500e (diff) | |
Calculate dependencies more reliably
Until now, dependencies weren't correct on first run or if you'd added includes since last compile.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 17 |
1 files changed, 11 insertions, 6 deletions
@@ -11,7 +11,7 @@ RGBFIX := rgbfix sort_sym := tools/sort_symfile.sh #sort_sym := $(PYTHON3) tools/sort_sym.py -RGBASMFLAGS := -h -E -i $(BUILD)/ -DGOLD -DDEBUG=1 +RGBASMFLAGS := -h -E -DGOLD -DDEBUG=1 tools/gfx := ROM := pokegold-spaceworld.gb @@ -21,8 +21,9 @@ CORRECTEDROM := $(ROM:%.gb=%-correctheader.gb) rwildcard = $(foreach d, $(wildcard $1*), $(filter $(subst *, %, $2), $d) $(call rwildcard, $d/, $2)) DIRS := home engine data audio +ASMFILES := $(call rwildcard, $(DIRS), *.asm) OBJS := $(addprefix $(BUILD)/, gfx.o vram.o sram.o wram.o hram.o shim.o) -OBJS += $(patsubst %.asm, $(BUILD)/%.o, $(call rwildcard, $(DIRS), *.asm)) +OBJS += $(patsubst %.asm, $(BUILD)/%.o, $(ASMFILES)) GFX := $(patsubst %.png, $(BUILD)/%.2bpp, \ $(patsubst %.1bpp.png, $(BUILD)/%.1bpp, \ @@ -53,7 +54,7 @@ clean: # Remove files except for graphics. .PHONY: mostlyclean mostlyclean: - rm -rf $(ROM) $(CORRECTEDROM) $(OBJS) $(OBJS:.o=.d) $(ROMS:.gb=.sym) $(ROMS:.gb=.map) + rm -rf $(ROM) $(CORRECTEDROM) $(OBJS) $(ROMS:.gb=.sym) $(ROMS:.gb=.map) # Utilities .PHONY: coverage @@ -87,9 +88,9 @@ $(BUILD)/shim.asm: tools/make_shim $(SHIM) | $$(dir $$@) $(BUILD)/gfx.o: | $(GFX) $(BUILD)/%.o: $(BUILD)/%.asm | $$(dir $$@) - $(RGBASM) $(RGBASMFLAGS) -M $(@:.o=.d) $(OUTPUT_OPTION) $< + $(RGBASM) $(RGBASMFLAGS) $(OUTPUT_OPTION) $< $(BUILD)/%.o: %.asm | $$(dir $$@) - $(RGBASM) $(RGBASMFLAGS) -M $(@:.o=.d) $(OUTPUT_OPTION) $< + $(RGBASM) $(RGBASMFLAGS) $(OUTPUT_OPTION) $< $(BUILD)/gfx/sgb/sgb_border_alt.2bpp: tools/gfx += --trim-whitespace $(BUILD)/gfx/sgb/sgb_border_gold.2bpp: tools/gfx += --trim-whitespace @@ -123,4 +124,8 @@ $(BUILD)/%.tilemap: %.png | $$(dir $$@) %/: mkdir -p $@ --include $(OBJS:.o=.d) +DEPENDENCY_SCAN_EXIT_STATUS := $(shell $(PYTHON3) tools/scan_includes.py $(ASMFILES) > dependencies.d; echo $$?) +ifneq ($(DEPENDENCY_SCAN_EXIT_STATUS), 0) +$(error Dependency scan failed) +endif +include dependencies.d |