# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1560624455 -10800
# Node ID bc16ad660e4e58f0eb8143f8fe86bb422c0e3e7d
# Parent  42a0172b8c8028ca370f90b1c2aa336d43a266fe
Improve build process and depencies robustness.

diff -r 42a0172b8c80 -r bc16ad660e4e Makefile.gen
--- a/Makefile.gen	Sat Jun 15 21:39:59 2019 +0300
+++ b/Makefile.gen	Sat Jun 15 21:47:35 2019 +0300
@@ -262,8 +262,10 @@
 TESTS_BINARIES += vecmattest fptest dzlibtest encbr1test
 endif
 
-FONTCONV_BIN=fontconv
-DATA2INC_BIN=data2inc
+ifneq ($(EXEEXT),.exe)
+FONTCONV_BIN=$(DMLIB)tools/fontconv
+DATA2INC_BIN=$(DMLIB)tools/data2inc
+endif
 
 
 ###
@@ -395,19 +397,19 @@
 	$(COMPILE_OBJ)
 
 
-$(DMLIB)assets/SetupFont.dmf: $(DMLIB)assets/SetupFont.fnt
+$(DMLIB)assets/SetupFont.dmf: $(DMLIB)assets/SetupFont.fnt $(FONTCONV_BIN)
 	@echo " FONT $@ $<"
 	@$(FONTCONV_BIN) $< $@
 
-$(DMLIB_SRC)setupfont.h: $(DMLIB)assets/SetupFont.dmf
+$(DMLIB_SRC)setupfont.h: $(DMLIB)assets/SetupFont.dmf $(DATA2INC_BIN)
 	@echo " DATA $@ $<"
 	@$(DATA2INC_BIN) -q -f c -n engineSetupFont -t Uint8 $< $@ > /dev/null
 
-$(DMLIB_SRC)setupimage.h: $(DMLIB)assets/SetupImage.png
+$(DMLIB_SRC)setupimage.h: $(DMLIB)assets/SetupImage.png $(DATA2INC_BIN)
 	@echo " DATA $@ $<"
 	@$(DATA2INC_BIN) -q -f c -n engineSetupImage -t Uint8 $< $@ > /dev/null
 
-$(DMLIB_SRC)setupmenubar.h: $(DMLIB)assets/SetupMenuBar.png
+$(DMLIB_SRC)setupmenubar.h: $(DMLIB)assets/SetupMenuBar.png  $(DATA2INC_BIN)
 	@echo " DATA $@ $<"
 	@$(DATA2INC_BIN) -q -f c -n engineSetupMenuBar -t Uint8 $< $@ > /dev/null