Mercurial > hg > dmlib

changeset 2253:bc16ad660e4e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improve build process and depencies robustness.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 15 Jun 2019 21:47:35 +0300
parents 42a0172b8c80
children 279b69a433df
files Makefile.gen
diffstat 1 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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