summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2015-01-20 00:01:23 -0800
committeryenatch <yenatch@gmail.com>2015-01-20 00:01:23 -0800
commit8583cc4724144e255d61a2c7ed7dd70036bcdb6e (patch)
tree0d6c0dd45f981d35ceb1a0b2c8ec9562da0c0f3f /Makefile
parentd8cf44a87e4da0e53ab44c487b865817b496a048 (diff)
Stop using the preprocessor.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 3 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index ce6e87cb1..d65dfb866 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,6 @@ PYTHON := python
poketools := extras/pokemontools
gfx := $(PYTHON) $(poketools)/gfx.py
includes := $(PYTHON) $(poketools)/scan_includes.py
-pre := $(PYTHON) prequeue.py
crystal_obj := \
@@ -48,14 +47,11 @@ baserom.gbc: ;
%.asm: ;
-%.tx: %.asm ; $(eval txq += $<) @rm -f $@
-
-$(all_obj): $$*.tx $$(patsubst %.asm, %.tx, $$($$*_dep))
- @$(pre) $(txq); $(eval txq :=)
+$(all_obj): $$*.asm $$($$*_dep)
@$(gfx) 2bpp $(2bppq); $(eval 2bppq :=)
@$(gfx) 1bpp $(1bppq); $(eval 1bppq :=)
- @$(gfx) lz $(lzq); $(eval lzq :=)
- rgbasm -o $@ $*.tx
+ @$(gfx) lz $(lzq); $(eval lzq :=)
+ rgbasm -o $@ $<
pokecrystal.gbc: $(crystal_obj)
rgblink -n $*.sym -m $*.map -o $@ $^