Mercurial > hg > dmlib

comparison Makefile.gen @ 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 b613715bb57a
comparison
equal deleted inserted replaced
2254:279b69a433df 2255:92385f9b7384
263 endif 263 endif
264 264
265 ifeq ($(EXEEXT),.exe) 265 ifeq ($(EXEEXT),.exe)
266 # Cross-building Windows binaries requires locally installed utilities 266 # Cross-building Windows binaries requires locally installed utilities
267 FONTCONV_BIN=fontconv 267 FONTCONV_BIN=fontconv
268 FONTCONV_DEP=
268 DATA2INC_BIN=data2inc 269 DATA2INC_BIN=data2inc
270 DATA2INC_DEP=
269 else 271 else
270 FONTCONV_BIN=$(DMLIB)tools/fontconv 272 FONTCONV_BIN=$(DMLIB)tools/fontconv
273 FONTCONV_DEP=$(FONTCONV_BIN)
271 DATA2INC_BIN=$(DMLIB)tools/data2inc 274 DATA2INC_BIN=$(DMLIB)tools/data2inc
275 DATA2INC_DEP=$(DATA2INC_BIN)
272 endif 276 endif
273 277
274 278
275 ### 279 ###
276 ### Rest of the rules 280 ### Rest of the rules
399 $(OBJPATH)ppl.o: $(TOOL_SRC)ppl.c $(DMLIB_SRC)setupfont.h \ 403 $(OBJPATH)ppl.o: $(TOOL_SRC)ppl.c $(DMLIB_SRC)setupfont.h \
400 $(OBJPATH)libgutil.o $(DMLIB_A) 404 $(OBJPATH)libgutil.o $(DMLIB_A)
401 $(COMPILE_OBJ) 405 $(COMPILE_OBJ)
402 406
403 407
404 $(DMLIB)assets/SetupFont.dmf: $(DMLIB)assets/SetupFont.fnt $(FONTCONV_BIN) 408 $(DMLIB)assets/SetupFont.dmf: $(DMLIB)assets/SetupFont.fnt $(FONTCONV_DEP)
405 @echo " FONT $@ $<" 409 @echo " FONT $@ $<"
406 @$(FONTCONV_BIN) $< $@ 410 @$(FONTCONV_BIN) $< $@
407 411
408 $(DMLIB_SRC)setupfont.h: $(DMLIB)assets/SetupFont.dmf $(DATA2INC_BIN) 412 $(DMLIB_SRC)setupfont.h: $(DMLIB)assets/SetupFont.dmf $(DATA2INC_DEP)
409 @echo " DATA $@ $<" 413 @echo " DATA $@ $<"
410 @$(DATA2INC_BIN) -q -f c -n engineSetupFont -t Uint8 $< $@ > /dev/null 414 @$(DATA2INC_BIN) -q -f c -n engineSetupFont -t Uint8 $< $@ > /dev/null
411 415
412 $(DMLIB_SRC)setupimage.h: $(DMLIB)assets/SetupImage.png $(DATA2INC_BIN) 416 $(DMLIB_SRC)setupimage.h: $(DMLIB)assets/SetupImage.png $(DATA2INC_DEP)
413 @echo " DATA $@ $<" 417 @echo " DATA $@ $<"
414 @$(DATA2INC_BIN) -q -f c -n engineSetupImage -t Uint8 $< $@ > /dev/null 418 @$(DATA2INC_BIN) -q -f c -n engineSetupImage -t Uint8 $< $@ > /dev/null
415 419
416 $(DMLIB_SRC)setupmenubar.h: $(DMLIB)assets/SetupMenuBar.png $(DATA2INC_BIN) 420 $(DMLIB_SRC)setupmenubar.h: $(DMLIB)assets/SetupMenuBar.png $(DATA2INC_DEP)
417 @echo " DATA $@ $<" 421 @echo " DATA $@ $<"
418 @$(DATA2INC_BIN) -q -f c -n engineSetupMenuBar -t Uint8 $< $@ > /dev/null 422 @$(DATA2INC_BIN) -q -f c -n engineSetupMenuBar -t Uint8 $< $@ > /dev/null
419 423
420 424
421 $(OBJPATH)dmsimple.o: $(addprefix $(DMLIB_SRC), dmsimple.c dmengine.h \ 425 $(OBJPATH)dmsimple.o: $(addprefix $(DMLIB_SRC), dmsimple.c dmengine.h \