diff options
| author | yenatch <yenatch@gmail.com> | 2014-02-01 13:55:48 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-02-01 13:55:48 -0500 |
| commit | 7f0f21b1fc2a6cf5dc19d0db80ec3afba024e291 (patch) | |
| tree | 71fcf0a5ffecca5ade5d5c148147a5312db3c859 /Makefile | |
| parent | 65efbe55e7648b6aa1a122155222e73b74dc31c1 (diff) | |
Get rid of globals.asm
This breaks the build until labels are exported again!
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 5 insertions, 10 deletions
@@ -30,7 +30,7 @@ ROMS := pokecrystal.gbc ALL_DEPENDENCIES := # generate a list of dependencies for each object file $(shell $(foreach obj, $(OBJS), \ - $(eval $(obj:.o=)_DEPENDENCIES := $(shell $(PYTHON) $(POKEMONTOOLS)/scan_includes.py $(obj:.o=.asm) | sed s/globals.asm//g)) \ + $(eval $(obj:.o=)_DEPENDENCIES := $(shell $(PYTHON) $(POKEMONTOOLS)/scan_includes.py $(obj:.o=.asm))) \ )) $(shell $(foreach obj, $(OBJS), \ $(eval ALL_DEPENDENCIES += $($(obj:.o=)_DEPENDENCIES)) \ @@ -44,7 +44,6 @@ crystal: pokecrystal.gbc clean: rm -f $(ROMS) rm -f $(OBJS) - rm -f globals.asm find -iname '*.tx' -exec rm {} + baserom.gbc: ; @@ -56,17 +55,13 @@ baserom.gbc: ; $(eval TEXTQUEUE := $(TEXTQUEUE) $<) @rm -f $@ -globals.asm: $(ALL_DEPENDENCIES:.asm=.tx) $(OBJS:.o=.tx) - @touch $@ - @$(PYTHON) prequeue.py $(TEXTQUEUE) -globals.tx: globals.asm - @cp $< $@ - $(OBJS): $$*.tx $$(patsubst %.asm, %.tx, $$($$*_DEPENDENCIES)) + @$(PYTHON) prequeue.py $(TEXTQUEUE) + @$(eval TEXTQUEUE :=) rgbasm -o $@ $*.tx -pokecrystal.gbc: globals.tx $(CRYSTAL_OBJS) - rgblink -n $*.sym -m $*.map -o $@ $(CRYSTAL_OBJS) +pokecrystal.gbc: $(CRYSTAL_OBJS) + rgblink -n $*.sym -m $*.map -o $@ $^ rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@ cmp baserom.gbc $@ |