From 638384c10ff1b7b1233bec1d62db3e82cffeaafc Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Mon, 19 Jun 2017 13:42:40 +0200 Subject: Add '-s' option to hexdump script to dump arrays using string literals. If the compiler supports string literals long enough, this will speed up compilation and reduce compiler memory use by a lot. Enough so that we don't need to use the .incbin asm directive. Gcc and Clang both support long string literals, so use the '-s' option for generated font files by default in the Makefile. --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b306c5df..65c31eab 100644 --- a/Makefile +++ b/Makefile @@ -197,15 +197,15 @@ FONT_GEN := $(FONT_GEN_DROID) $(FONT_GEN_NOTO) $(FONT_GEN_HAN) $(FONT_GEN_URW) $ FONT_OBJ := $(FONT_GEN:%.c=$(OUT)/%.o) generated/%.c : resources/fonts/droid/%.ttf $(HEXDUMP_EXE) | generated - $(QUIET_GEN) $(HEXDUMP_EXE) $@ $< + $(QUIET_GEN) $(HEXDUMP_EXE) -s $@ $< generated/%.c : resources/fonts/noto/%.ttf $(HEXDUMP_EXE) | generated - $(QUIET_GEN) $(HEXDUMP_EXE) $@ $< + $(QUIET_GEN) $(HEXDUMP_EXE) -s $@ $< generated/%.c : resources/fonts/han/%.otf $(HEXDUMP_EXE) | generated - $(QUIET_GEN) $(HEXDUMP_EXE) $@ $< + $(QUIET_GEN) $(HEXDUMP_EXE) -s $@ $< generated/%.c : resources/fonts/urw/%.cff $(HEXDUMP_EXE) | generated - $(QUIET_GEN) $(HEXDUMP_EXE) $@ $< + $(QUIET_GEN) $(HEXDUMP_EXE) -s $@ $< generated/%.c : resources/fonts/sil/%.cff $(HEXDUMP_EXE) | generated - $(QUIET_GEN) $(HEXDUMP_EXE) $@ $< + $(QUIET_GEN) $(HEXDUMP_EXE) -s $@ $< $(FONT_OBJ) : $(FONT_GEN) $(FONT_GEN_DROID) : $(FONT_BIN_DROID) -- cgit v1.2.3