From 266dc52fab0cad568b6f0dddcf1d4cee2d1b1e73 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Fri, 18 May 2012 23:24:57 +0200 Subject: Make the player_unifont tool build again This tool is rarely needed (only when working on the player charset) and got lost in the big make system overhaul. --- tools/root.make | 3 +++ tools/tools.make | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/tools/root.make b/tools/root.make index 689047e9db..256d25c1df 100644 --- a/tools/root.make +++ b/tools/root.make @@ -23,6 +23,9 @@ TOOLS = $(TOOLSDIR)/rdf2binary $(TOOLSDIR)/convbdf \ $(TOOLSDIR)/uclpack $(TOOLSDIR)/mkboot $(TOOLSDIR)/iaudio_bl_flash.c \ $(TOOLSDIR)/iaudio_bl_flash.h +ifeq ($(MODELNAME),archosplayer) + TOOLS += $(TOOLSDIR)/player_unifont +endif ifeq (,$(PREFIX)) ifdef APP_TYPE diff --git a/tools/tools.make b/tools/tools.make index 3350ad03bc..9f16d4c884 100644 --- a/tools/tools.make +++ b/tools/tools.make @@ -40,6 +40,10 @@ $(TOOLSDIR)/convttf: $(TOOLSDIR)/convttf.c $(SILENT)$(HOSTCC) $(TOOLSFLAGS) -lm -O2 -Wall -g $+ -o $@ \ `freetype-config --libs` `freetype-config --cflags` +$(TOOLSDIR)/player_unifont: $(TOOLSDIR)/player_unifont.c $(ROOTDIR)/firmware/drivers/lcd-charset-player.c + $(call PRINTS,CC $(@F)) + $(SILENT)$(HOSTCC) $(TOOLSFLAGS) -DARCHOS_PLAYER -D__PCTOOL__ -I$(ROOTDIR)/firmware/export -I. $+ -o $@ + # implicit rule for simple tools $(TOOLSDIR)/%: $(TOOLSDIR)/%.c $(call PRINTS,CC $(subst $(ROOTDIR)/,,$@)) -- cgit v1.2.3