summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2016-06-18 23:58:40 -0400
committeryenatch <yenatch@gmail.com>2016-06-18 23:58:40 -0400
commit717026d4399bd24008d7b4432c74b97bba3d2418 (patch)
treeefb6c7b8b3f7d720065322abe69a6aa7451f7c40
parentfec4708e80a532238cbc506309673567e95c5933 (diff)
src/link.c also depends on LINK_HEADERS.
-rw-r--r--Makefile3
-rw-r--r--generated.mk4
2 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 202ba8b25..ac1e22af6 100644
--- a/Makefile
+++ b/Makefile
@@ -90,7 +90,8 @@ src/m4a_4_ruby.o src/m4a_2_sapphire.o: CC1 := tools/agbcc/bin/old_agbcc
src/%_ruby.o: VERSION := -D RUBY
src/%_sapphire.o: VERSION := -D SAPPHIRE
-src/text_ruby.o src/text_sapphire.o: $(GENFONTS) src/text.c
+src/text_ruby.o src/text_sapphire.o: src/text.c $(GEN_FONTS)
+src/link_ruby.o src/link_sapphire.o: src/link.c $(GEN_LINK_HEADERS)
src/%_ruby.o src/%_sapphire.o src/%.o: src/%.c
@$(CPP) $(CPPFLAGS) $(VERSION) $< -o $*.i
@$(PREPROC) $*.i charmap.txt | $(CC1) $(CFLAGS) -o $*.s
diff --git a/generated.mk b/generated.mk
index 218830b9c..08c4aca24 100644
--- a/generated.mk
+++ b/generated.mk
@@ -10,9 +10,9 @@ include/fonts/down_arrow_tiles.h \
include/fonts/unknown_palette_81E6692.h \
include/fonts/default_palette.h
-LINK_HEADERS := include/link/digit_tiles.h include/link/digit_palette.h
+GEN_LINK_HEADERS := include/link/digit_tiles.h include/link/digit_palette.h
-GENFONTS := $(GEN_FONT_HEADERS) $(LINK_HEADERS)
+GEN_FONTS := $(GEN_FONT_HEADERS) $(GEN_LINK_HEADERS)
include/fonts/font0_lat_glyphs.h: graphics/fonts/font0_lat.1bpp
$(BIN2C) $< sFont0LatinGlyphs >$@ -static -col 8 -pad 4