Mercurial > hg > dmlib

changeset 2255:92385f9b7384

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More cross-build fixing ..
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 15 Jun 2019 21:54:14 +0300
parents 279b69a433df
children fe974f670d1d
files Makefile.gen
diffstat 1 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.gen	Sat Jun 15 21:50:58 2019 +0300
+++ b/Makefile.gen	Sat Jun 15 21:54:14 2019 +0300
@@ -265,10 +265,14 @@
 ifeq ($(EXEEXT),.exe)
 # Cross-building Windows binaries requires locally installed utilities
 FONTCONV_BIN=fontconv
+FONTCONV_DEP=
 DATA2INC_BIN=data2inc
+DATA2INC_DEP=
 else
 FONTCONV_BIN=$(DMLIB)tools/fontconv
+FONTCONV_DEP=$(FONTCONV_BIN)
 DATA2INC_BIN=$(DMLIB)tools/data2inc
+DATA2INC_DEP=$(DATA2INC_BIN)
 endif
 
 
@@ -401,19 +405,19 @@
 	$(COMPILE_OBJ)
 
 
-$(DMLIB)assets/SetupFont.dmf: $(DMLIB)assets/SetupFont.fnt $(FONTCONV_BIN)
+$(DMLIB)assets/SetupFont.dmf: $(DMLIB)assets/SetupFont.fnt $(FONTCONV_DEP)
 	@echo " FONT $@ $<"
 	@$(FONTCONV_BIN) $< $@
 
-$(DMLIB_SRC)setupfont.h: $(DMLIB)assets/SetupFont.dmf $(DATA2INC_BIN)
+$(DMLIB_SRC)setupfont.h: $(DMLIB)assets/SetupFont.dmf $(DATA2INC_DEP)
 	@echo " DATA $@ $<"
 	@$(DATA2INC_BIN) -q -f c -n engineSetupFont -t Uint8 $< $@ > /dev/null
 
-$(DMLIB_SRC)setupimage.h: $(DMLIB)assets/SetupImage.png $(DATA2INC_BIN)
+$(DMLIB_SRC)setupimage.h: $(DMLIB)assets/SetupImage.png $(DATA2INC_DEP)
 	@echo " DATA $@ $<"
 	@$(DATA2INC_BIN) -q -f c -n engineSetupImage -t Uint8 $< $@ > /dev/null
 
-$(DMLIB_SRC)setupmenubar.h: $(DMLIB)assets/SetupMenuBar.png  $(DATA2INC_BIN)
+$(DMLIB_SRC)setupmenubar.h: $(DMLIB)assets/SetupMenuBar.png  $(DATA2INC_DEP)
 	@echo " DATA $@ $<"
 	@$(DATA2INC_BIN) -q -f c -n engineSetupMenuBar -t Uint8 $< $@ > /dev/null