# HG changeset patch # User Matti Hamalainen # Date 1560624854 -10800 # Node ID 92385f9b73848e02ba2eb809779e1cd56817ab9a # Parent 279b69a433df5398aff5a0203049c9b733e2484a More cross-build fixing .. diff -r 279b69a433df -r 92385f9b7384 Makefile.gen --- 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