# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1366224874 -10800
# Node ID 24096d1ef79419656e1c2332561141ac3fc3517f
# Parent  a20f127e6e1b0886b40083322858f711bb85b7d1
Make pre-built header versions of assets not depend on fontconv and
data2inc.

diff -r a20f127e6e1b -r 24096d1ef794 Makefile.gen
--- a/Makefile.gen	Wed Apr 17 20:11:04 2013 +0300
+++ b/Makefile.gen	Wed Apr 17 21:54:34 2013 +0300
@@ -252,8 +252,8 @@
 TESTS_BINARIES += vecmattest fptest evaltest
 endif
 
-FONTCONV_BIN=$(TOOL_BINPATH)fontconv$(EXEEXT)
-DATA2INC_BIN=$(TOOL_BINPATH)data2inc$(EXEEXT)
+FONTCONV_BIN=fontconv
+DATA2INC_BIN=data2inc
 
 
 ###
@@ -375,16 +375,16 @@
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) $(LIBPNG_CFLAGS)
 
 
-$(DMLIB)assets/SetupFont.dmf: $(DMLIB)assets/SetupFont.fnt $(FONTCONV_BIN)
+$(DMLIB)assets/SetupFont.dmf: $(DMLIB)assets/SetupFont.fnt
 	$(FONTCONV_BIN) -o $@ $<
 
-$(DMLIB)setupfont.h: $(DMLIB)assets/SetupFont.dmf $(DATA2INC_BIN)
+$(DMLIB)setupfont.h: $(DMLIB)assets/SetupFont.dmf
 	$(DATA2INC_BIN) -q -C -n engineSetupFont -t Uint8 $< $@
 
-$(DMLIB)setupimage.h: $(DMLIB)assets/SetupImage.png $(DATA2INC_BIN)
+$(DMLIB)setupimage.h: $(DMLIB)assets/SetupImage.png
 	$(DATA2INC_BIN) -q -C -n engineSetupImage -t Uint8 $< $@
 
-$(DMLIB)setupmenubar.h: $(DMLIB)assets/SetupMenuBar.png $(DATA2INC_BIN)
+$(DMLIB)setupmenubar.h: $(DMLIB)assets/SetupMenuBar.png
 	$(DATA2INC_BIN) -q -C -n engineSetupMenuBar -t Uint8 $< $@
 
 
@@ -433,11 +433,11 @@
 ###
 ### Tools
 ###
-$(FONTCONV_BIN): $(OBJPATH)fontconv.o $(DMLIB_A)
+$(TOOL_BINPATH)fontconv$(EXEEXT): $(OBJPATH)fontconv.o $(DMLIB_A)
 	@echo " LINK $+"
 	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) -lSDL_ttf
 
-$(DATA2INC_BIN): $(OBJPATH)data2inc.o $(DMLIB_A)
+$(TOOL_BINPATH)data2inc$(EXEEXT): $(OBJPATH)data2inc.o $(DMLIB_A)
 	@echo " LINK $+"
 	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)