Mercurial > hg > dmlib
changeset 716:24096d1ef794
Make pre-built header versions of assets not depend on fontconv and
data2inc.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Wed, 17 Apr 2013 21:54:34 +0300 |
| parents | a20f127e6e1b |
| children | 451fde45e116 |
| files | Makefile.gen |
| diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.gen Wed Apr 17 20:11:04 2013 +0300 +++ b/Makefile.gen Wed Apr 17 21:54:34 2013 +0300 @@ -252,8 +252,8 @@ TESTS_BINARIES += vecmattest fptest evaltest endif -FONTCONV_BIN=$(TOOL_BINPATH)fontconv$(EXEEXT) -DATA2INC_BIN=$(TOOL_BINPATH)data2inc$(EXEEXT) +FONTCONV_BIN=fontconv +DATA2INC_BIN=data2inc ### @@ -375,16 +375,16 @@ @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) $(LIBPNG_CFLAGS) -$(DMLIB)assets/SetupFont.dmf: $(DMLIB)assets/SetupFont.fnt $(FONTCONV_BIN) +$(DMLIB)assets/SetupFont.dmf: $(DMLIB)assets/SetupFont.fnt $(FONTCONV_BIN) -o $@ $< -$(DMLIB)setupfont.h: $(DMLIB)assets/SetupFont.dmf $(DATA2INC_BIN) +$(DMLIB)setupfont.h: $(DMLIB)assets/SetupFont.dmf $(DATA2INC_BIN) -q -C -n engineSetupFont -t Uint8 $< $@ -$(DMLIB)setupimage.h: $(DMLIB)assets/SetupImage.png $(DATA2INC_BIN) +$(DMLIB)setupimage.h: $(DMLIB)assets/SetupImage.png $(DATA2INC_BIN) -q -C -n engineSetupImage -t Uint8 $< $@ -$(DMLIB)setupmenubar.h: $(DMLIB)assets/SetupMenuBar.png $(DATA2INC_BIN) +$(DMLIB)setupmenubar.h: $(DMLIB)assets/SetupMenuBar.png $(DATA2INC_BIN) -q -C -n engineSetupMenuBar -t Uint8 $< $@ @@ -433,11 +433,11 @@ ### ### Tools ### -$(FONTCONV_BIN): $(OBJPATH)fontconv.o $(DMLIB_A) +$(TOOL_BINPATH)fontconv$(EXEEXT): $(OBJPATH)fontconv.o $(DMLIB_A) @echo " LINK $+" @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) -lSDL_ttf -$(DATA2INC_BIN): $(OBJPATH)data2inc.o $(DMLIB_A) +$(TOOL_BINPATH)data2inc$(EXEEXT): $(OBJPATH)data2inc.o $(DMLIB_A) @echo " LINK $+" @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)