summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-09-15 15:38:54 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-09-15 15:38:54 -0400
commitf77f7ae58916fe0bfe342f80fc8429f647727ece (patch)
tree4c611a1d0c935a90d404169c02ce46d008a20709
parent8ec949a8128f771fd5275434c2804708b9babfdd (diff)
Makefile variables for tool locations
-rw-r--r--Makefile10
-rw-r--r--gfx/gfx.mk14
2 files changed, 14 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 6bdf53d..d49ae02 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,8 @@ RGBASMFLAGS := -p 0xff -L -h -E
RGBLINKFLAGS := -p 0xff -d
RGBFIXFLAGS := -p 0xff -c -m 0x1b -r 0x03 -k "01" -i "AKVJ" -t "POKEPICROSS"
+SCAN_INCLUDES := tools/scan_includes
+
rwildcard = $(foreach d, $(wildcard $1*), $(filter $(subst *, %, $2), $d) $(call rwildcard, $d/, $2))
objects := $(patsubst %.asm, $(dir_build)/%.o, \
@@ -35,11 +37,11 @@ tools: $(tools)
.PHONY: clean
clean:
- rm -rf $(name).gbc $(name).sym $(name).map $(dir_build) $(tools)
+ rm -rf $(name).gbc $(name).sym $(name).map $(tools) $(dir_build)
.PHONY: tidy
tidy:
- rm -rf $(name).gbc $(name).sym $(name).map
+ rm -rf $(name).gbc $(name).sym $(name).map $(tools)
find $(dir_build) \( -name "*.o" \) -delete
$(name).gbc: layout.link $(objects) | $(baserom)
@@ -54,8 +56,8 @@ $(dir_build)/%.o: $(dir_build)/%.asm | $$(dir $$@)
$(dir_build)/%.o: %.asm | $$(dir $$@)
$(RGBASM) $(RGBASMFLAGS) -i $(dir_build)/ -i include/ -o $@ $<
-$(dir_build)/%.d: %.asm tools/scan_includes | $$(dir $$@)
- @./tools/scan_includes -b $(dir_build)/ -i $(dir_build)/ -i include/ -o $@ -t $(@:.d=.o) $<
+$(dir_build)/%.d: %.asm | $$(dir $$@) $(SCAN_INCLUDES)
+ @$(SCAN_INCLUDES) -b $(dir_build)/ -i $(dir_build)/ -i include/ -o $@ -t $(@:.d=.o) $<
.PRECIOUS: %/
%/:
diff --git a/gfx/gfx.mk b/gfx/gfx.mk
index f529ee0..d2f1d78 100644
--- a/gfx/gfx.mk
+++ b/gfx/gfx.mk
@@ -9,10 +9,12 @@ $(dir_build)/gfx/data_select/data_select.2bpp: gfx/data_select/data_select.png |
$(RGBGFX) $(RGBGFXFLAGS) -o $@ $<
printf 3 >> $@
-$(dir_build)/%.xor: $(dir_build)/% | $$(dir $$@) tools/xor_compress
- tools/xor_compress $< $@
-$(dir_build)/%.xor: % | $$(dir $$@) tools/xor_compress
- tools/xor_compress $< $@
+XOR_COMPRESS := tools/xor_compress
-$(dir_build)/%.tilemap_attrmap.xor: %.tilemap %.attrmap | $$(dir $$@) tools/xor_compress
- tools/xor_compress $^ $@
+$(dir_build)/%.xor: $(dir_build)/% | $$(dir $$@) $(XOR_COMPRESS)
+ $(XOR_COMPRESS) $< $@
+$(dir_build)/%.xor: % | $$(dir $$@) $(XOR_COMPRESS)
+ $(XOR_COMPRESS) $< $@
+
+$(dir_build)/%.tilemap_attrmap.xor: %.tilemap %.attrmap | $$(dir $$@) $(XOR_COMPRESS)
+ $(XOR_COMPRESS) $^ $@