From 954e3bb173c3302bf458875e86c49c712f0789d4 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Thu, 23 Jun 2016 16:41:18 +0200 Subject: Add Source Han Sans CJK per-language fonts. Import fonts from v1.004. --- Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b69e7547..38758966 100644 --- a/Makefile +++ b/Makefile @@ -115,22 +115,26 @@ $(GPRF_OBJ) : $(FITZ_HDR) $(GPRF_HDR) $(GPRF_SRC_HDR) FONT_BIN_DROID := $(wildcard resources/fonts/droid/*.ttf) FONT_BIN_NOTO := $(wildcard resources/fonts/noto/*.ttf) +FONT_BIN_HAN := $(wildcard resources/fonts/han/*.otf) FONT_BIN_URW := $(wildcard resources/fonts/urw/*.cff) FONT_BIN_SIL := $(wildcard resources/fonts/sil/*.cff) FONT_GEN_DROID := $(subst resources/fonts/droid/, $(GEN)/, $(addsuffix .c, $(basename $(FONT_BIN_DROID)))) FONT_GEN_NOTO := $(subst resources/fonts/noto/, $(GEN)/, $(addsuffix .c, $(basename $(FONT_BIN_NOTO)))) +FONT_GEN_HAN := $(subst resources/fonts/han/, $(GEN)/, $(addsuffix .c, $(basename $(FONT_BIN_HAN)))) FONT_GEN_URW := $(subst resources/fonts/urw/, $(GEN)/, $(addsuffix .c, $(basename $(FONT_BIN_URW)))) FONT_GEN_SIL := $(subst resources/fonts/sil/, $(GEN)/, $(addsuffix .c, $(basename $(FONT_BIN_SIL)))) -FONT_BIN := $(FONT_BIN_DROID) $(FONT_BIN_NOTO) $(FONT_BIN_URW) $(FONT_BIN_SIL) -FONT_GEN := $(FONT_GEN_DROID) $(FONT_GEN_NOTO) $(FONT_GEN_URW) $(FONT_GEN_SIL) +FONT_BIN := $(FONT_BIN_DROID) $(FONT_BIN_NOTO) $(FONT_BIN_HAN) $(FONT_BIN_URW) $(FONT_BIN_SIL) +FONT_GEN := $(FONT_GEN_DROID) $(FONT_GEN_NOTO) $(FONT_GEN_HAN) $(FONT_GEN_URW) $(FONT_GEN_SIL) FONT_OBJ := $(subst $(GEN)/, $(OUT)/fonts/, $(addsuffix .o, $(basename $(FONT_GEN)))) $(GEN)/%.c : resources/fonts/droid/%.ttf $(FONTDUMP) $(QUIET_GEN) $(FONTDUMP) $@ $< $(GEN)/%.c : resources/fonts/noto/%.ttf $(FONTDUMP) $(QUIET_GEN) $(FONTDUMP) $@ $< +$(GEN)/%.c : resources/fonts/han/%.otf $(FONTDUMP) + $(QUIET_GEN) $(FONTDUMP) $@ $< $(GEN)/%.c : resources/fonts/urw/%.cff $(FONTDUMP) $(QUIET_GEN) $(FONTDUMP) $@ $< $(GEN)/%.c : resources/fonts/sil/%.cff $(FONTDUMP) @@ -139,7 +143,9 @@ $(GEN)/%.c : resources/fonts/sil/%.cff $(FONTDUMP) $(FONT_OBJ) : $(FONT_GEN) $(FONT_GEN_DROID) : $(FONT_BIN_DROID) $(FONT_GEN_NOTO) : $(FONT_BIN_NOTO) +$(FONT_GEN_HAN) : $(FONT_BIN_HAN) $(FONT_GEN_URW) : $(FONT_BIN_URW) +$(FONT_GEN_SIL) : $(FONT_BIN_SIL) # --- Library --- -- cgit v1.2.3