diff Makefile.gen @ 584:923d920a8a85

Build setupfont.h and setupimage.h from source data files. Use setupfont in PPL.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 12 Apr 2013 05:12:08 +0300
parents 14640d0688d3
children 296133d29611
line wrap: on
line diff
--- a/Makefile.gen	Fri Apr 12 05:10:16 2013 +0300
+++ b/Makefile.gen	Fri Apr 12 05:12:08 2013 +0300
@@ -251,6 +251,9 @@
 BINARIES += vecmattest fptest
 endif
 
+FONTCONV_BIN=$(BINPATH)fontconv$(EXEEXT)
+DATA2INC_BIN=$(BINPATH)data2inc$(EXEEXT)
+
 TOOL_TARGETS = $(addprefix $(BINPATH),$(addsuffix $(EXEEXT),$(TOOL_BINARIES)))
 TARGETS += $(DMLIB_A) $(addprefix $(BINPATH),$(addsuffix $(EXEEXT),$(BINARIES))) $(TOOL_TARGETS)
 
@@ -368,15 +371,23 @@
 	@echo " LINK $+"
 	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
 
-$(BINPATH)fontconv$(EXEEXT): $(OBJPATH)fontconv.o $(DMLIB_A)
+
+$(FONTCONV_BIN): $(OBJPATH)fontconv.o $(DMLIB_A)
 	@echo " LINK $+"
 	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) -lSDL_ttf
 
-$(BINPATH)testpl$(EXEEXT): $(OBJPATH)testpl.o $(DMLIB_A)
+$(DMLIB)graphics/SetupFont.dmf: $(DMLIB)graphics/SetupFont.fnt
+	$(FONTCONV_BIN) -o $@ $<
+
+setupfont.h: $(DMLIB)graphics/SetupFont.dmf
+	$(DATA2INC_BIN) -C -n engineSetupFont -t Uint8 $< $@
+
+$(BINPATH)ppl$(EXEEXT): $(OBJPATH)ppl.o $(DMLIB_A) setupfont.h
 	@echo " LINK $+"
 	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS)
 
-$(BINPATH)ppl$(EXEEXT): $(OBJPATH)ppl.o $(DMLIB_A) pplfont.h
+
+$(BINPATH)testpl$(EXEEXT): $(OBJPATH)testpl.o $(DMLIB_A)
 	@echo " LINK $+"
 	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS)
 
@@ -389,7 +400,7 @@
 	@echo " LINK $+"
 	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
 
-$(BINPATH)data2inc$(EXEEXT): $(OBJPATH)data2inc.o $(DMLIB_A)
+$(DATA2INC_BIN): $(OBJPATH)data2inc.o $(DMLIB_A)
 	@echo " LINK $+"
 	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)