summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2013-09-11 18:05:41 -0700
committerBryan Bishop <kanzure@gmail.com>2013-09-11 18:05:41 -0700
commitd536990828adee8a47e71f24ec45900ea783cd7a (patch)
tree013c23dd6969ecba4cd199e24447d640097bcb52 /Makefile
parent18656332b7b4ca67461d4cd4b6b8282d3bc7ab0c (diff)
parent81c5f251a6e253a43344e4695209df871c41045c (diff)
Merge pull request #203 from yenatch/globals
consolidate labels across objects into globals.asm
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile24
1 files changed, 17 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 7150b4849..218686bce 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ PYTHON := python
.PHONY: all clean pngs gfx
.SECONDEXPANSION:
-TEXTFILES := $(shell find ./ -type f -name '*.asm')
+TEXTFILES := $(shell find ./ -type f -name '*.asm' | grep -v globals.asm)
TEXTQUEUE :=
OBJS := pokecrystal.o
@@ -13,12 +13,19 @@ LZS := $(shell find gfx/ -type f -name '*.lz')
_2BPPS := $(shell find gfx/ -type f -name '*.2bpp')
_1BPPS := $(shell find gfx/ -type f -name '*.1bpp')
-$(shell $(foreach obj, $(OBJS), $(eval OBJ_$(obj:.o=) := $(shell $(PYTHON) scan_includes.py $(obj:.o=.asm)))))
+# generate a list of dependencies for each object file
+$(shell \
+ $(foreach obj, $(OBJS), \
+ $(eval OBJ_$(obj:.o=) := \
+ $(shell $(PYTHON) scan_includes.py $(obj:.o=.asm) | sed s/globals.asm//g)) \
+ ) \
+)
-all: baserom.gbc pokecrystal.gbc
+all: baserom.gbc globals.asm pokecrystal.gbc
cmp baserom.gbc pokecrystal.gbc
clean:
rm -f pokecrystal.o pokecrystal.gbc
+ rm -f globals.asm globals.tx
@echo 'Removing preprocessed .tx files...'
@rm -f $(TEXTFILES:.asm=.tx)
@@ -29,14 +36,17 @@ baserom.gbc:
$(eval TEXTQUEUE := $(TEXTQUEUE) $<)
@rm -f $@
-$(OBJS): $$(patsubst %.o,%.tx,$$@) $$(patsubst %.asm,%.tx,$$(OBJ_$$(patsubst %.o,%,$$@)))
+globals.asm: $(TEXTFILES:.asm=.tx)
+ @echo "Creating globals.asm..."
+ @touch globals.asm
@echo "Preprocessing .asm to .tx..."
- @$(PYTHON) prequeue.py $(TEXTQUEUE)
- $(eval TEXTQUEUE := )
+ @$(PYTHON) prequeue.py $(TEXTQUEUE) globals.asm
+
+$(OBJS): $$(patsubst %.o,%.tx,$$@) $$(patsubst %.asm,%.tx,$$(OBJ_$$(patsubst %.o,%,$$@)))
rgbasm -o $@ $(@:.o=.tx)
pokecrystal.gbc: $(OBJS)
- rgblink -n pokecrystal.sym -m pokecrystal.map -o pokecrystal.gbc $<
+ rgblink -n pokecrystal.sym -m pokecrystal.map -o pokecrystal.gbc $^
rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@
pngs: