Mercurial > hg > dmlib

comparison Makefile.gen @ 2420:621d071530ce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Convert more instances of direct commands in rules to DO_CMD macro calls.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 14 Jan 2020 04:54:30 +0200
parents 510837da62aa
children ba8b44cd313b
comparison
equal deleted inserted replaced
2419:510837da62aa 2420:621d071530ce
436 $(OBJPATH)libgutil.o $(DMLIB_A) 436 $(OBJPATH)libgutil.o $(DMLIB_A)
437 $(COMPILE_C_OBJ) 437 $(COMPILE_C_OBJ)
438 438
439 439
440 $(DMLIB)assets/SetupFont.dmf: $(DMLIB)assets/SetupFont.fnt $(FONTCONV_DEP) 440 $(DMLIB)assets/SetupFont.dmf: $(DMLIB)assets/SetupFont.fnt $(FONTCONV_DEP)
441 @echo " FONT $@ $<" 441 @$(call DO_CMD,FONT,$@ $<,$(FONTCONV_BIN) $< $@)
442 @$(FONTCONV_BIN) $< $@
443 442
444 $(DMLIB_SRC)setupfont.h: $(DMLIB)assets/SetupFont.dmf $(DATA2INC_DEP) 443 $(DMLIB_SRC)setupfont.h: $(DMLIB)assets/SetupFont.dmf $(DATA2INC_DEP)
445 @echo " DATA $@ $<" 444 @$(call DO_CMD,DATA,$@ $<,$(DATA2INC_BIN) -q -f c -n engineSetupFont -t Uint8 $< $@ > /dev/null)
446 @$(DATA2INC_BIN) -q -f c -n engineSetupFont -t Uint8 $< $@ > /dev/null
447 445
448 $(DMLIB_SRC)setupimage.h: $(DMLIB)assets/SetupImage.png $(DATA2INC_DEP) 446 $(DMLIB_SRC)setupimage.h: $(DMLIB)assets/SetupImage.png $(DATA2INC_DEP)
449 @echo " DATA $@ $<" 447 @$(call DO_CMD,DATA,$@ $<,$(DATA2INC_BIN) -q -f c -n engineSetupImage -t Uint8 $< $@ > /dev/null)
450 @$(DATA2INC_BIN) -q -f c -n engineSetupImage -t Uint8 $< $@ > /dev/null
451 448
452 $(DMLIB_SRC)setupmenubar.h: $(DMLIB)assets/SetupMenuBar.png $(DATA2INC_DEP) 449 $(DMLIB_SRC)setupmenubar.h: $(DMLIB)assets/SetupMenuBar.png $(DATA2INC_DEP)
453 @echo " DATA $@ $<" 450 @$(call DO_CMD,DATA,$@ $<,$(DATA2INC_BIN) -q -f c -n engineSetupMenuBar -t Uint8 $< $@ > /dev/null)
454 @$(DATA2INC_BIN) -q -f c -n engineSetupMenuBar -t Uint8 $< $@ > /dev/null
455 451
456 452
457 $(OBJPATH)dmsimple.o: $(addprefix $(DMLIB_SRC), dmsimple.c dmengine.h \ 453 $(OBJPATH)dmsimple.o: $(addprefix $(DMLIB_SRC), dmsimple.c dmengine.h \
458 setupmenubar.h setupfont.h setupimage.h dmsimple.c) 454 setupmenubar.h setupfont.h setupimage.h dmsimple.c)
459 $(COMPILE_C_OBJ) 455 $(COMPILE_C_OBJ)
546 @echo "SOURCES = $(addprefix $(DMLIB),$(EDITOR_SOURCES))" >> $@ 542 @echo "SOURCES = $(addprefix $(DMLIB),$(EDITOR_SOURCES))" >> $@
547 @echo "HEADERS = $(addprefix $(DMLIB),$(EDITOR_HEADERS))" >> $@ 543 @echo "HEADERS = $(addprefix $(DMLIB),$(EDITOR_HEADERS))" >> $@
548 544
549 545
550 $(EDITOR_MAKEFILE): $(EDITOR_PRO) 546 $(EDITOR_MAKEFILE): $(EDITOR_PRO)
551 @echo " QMAKE $+" 547 @$(call DO_CMD,QMAKE,$+,qmake -Wall $<)
552 @qmake -Wall $<
553 548
554 $(BINPATH)ed_$(DEMO_BIN)$(BINEXT): $(EDITOR_MAKEFILE) 549 $(BINPATH)ed_$(DEMO_BIN)$(BINEXT): $(EDITOR_MAKEFILE)
555 @$(MAKE) -f $< 550 @$(MAKE) -f $<
556 551
557 552