mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-09-09 09:51:34 -07:00
Make sure tools are built before dependencies are generated
Avoids calling a program that doesn't exist yet (not actively harmful, but yeah...)
This commit is contained in:
parent
0425018d1c
commit
8b429e2a54
12
Makefile
12
Makefile
@ -123,6 +123,12 @@ $(pokecrystal11_vc_obj): RGBASMFLAGS += -D _CRYSTAL11 -D _CRYSTAL11_VC
|
|||||||
rgbdscheck.o: rgbdscheck.asm
|
rgbdscheck.o: rgbdscheck.asm
|
||||||
$(RGBASM) -o $@ $<
|
$(RGBASM) -o $@ $<
|
||||||
|
|
||||||
|
# Build tools when building the rom.
|
||||||
|
# This has to happen before the rules are processed, since that's when scan_includes is run.
|
||||||
|
ifeq (,$(filter clean tidy tools,$(MAKECMDGOALS)))
|
||||||
|
|
||||||
|
$(info $(shell $(MAKE) -C tools))
|
||||||
|
|
||||||
# The dep rules have to be explicit or else missing files won't be reported.
|
# The dep rules have to be explicit or else missing files won't be reported.
|
||||||
# As a side effect, they're evaluated immediately instead of when the rule is invoked.
|
# As a side effect, they're evaluated immediately instead of when the rule is invoked.
|
||||||
# It doesn't look like $(shell) can be deferred so there might not be a better way.
|
# It doesn't look like $(shell) can be deferred so there might not be a better way.
|
||||||
@ -132,12 +138,6 @@ $1: $2 $$(shell tools/scan_includes $2) $(preinclude_deps) | rgbdscheck.o
|
|||||||
$$(RGBASM) $$(RGBASMFLAGS) -o $$@ $$<
|
$$(RGBASM) $$(RGBASMFLAGS) -o $$@ $$<
|
||||||
endef
|
endef
|
||||||
|
|
||||||
# Build tools when building the rom.
|
|
||||||
# This has to happen before the rules are processed, since that's when scan_includes is run.
|
|
||||||
ifeq (,$(filter clean tidy tools,$(MAKECMDGOALS)))
|
|
||||||
|
|
||||||
$(info $(shell $(MAKE) -C tools))
|
|
||||||
|
|
||||||
# Dependencies for shared objects objects
|
# Dependencies for shared objects objects
|
||||||
$(foreach obj, $(pokecrystal_obj), $(eval $(call DEP,$(obj),$(obj:.o=.asm))))
|
$(foreach obj, $(pokecrystal_obj), $(eval $(call DEP,$(obj),$(obj:.o=.asm))))
|
||||||
$(foreach obj, $(pokecrystal11_obj), $(eval $(call DEP,$(obj),$(obj:11.o=.asm))))
|
$(foreach obj, $(pokecrystal11_obj), $(eval $(call DEP,$(obj),$(obj:11.o=.asm))))
|
||||||
|
Loading…
Reference in New Issue
Block a user