Mercurial > hg > dmlib
changeset 2348:2d8fee642543
Improve build system: only hard depend on fontconv and data2inc when we are
building with tools to begin with.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Tue, 29 Oct 2019 14:36:13 +0200 |
parents | 32893335efc0 |
children | 463e5d9771ee |
files | Makefile.gen |
diffstat | 1 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.gen Thu Oct 24 08:19:48 2019 +0300 +++ b/Makefile.gen Tue Oct 29 14:36:13 2019 +0200 @@ -262,18 +262,19 @@ TESTS_BINARIES += vecmattest fptest dzlibtest encbr1test endif +FONTCONV_BIN=$(TOOL_BINPATH)fontconv$(EXEEXT) +DATA2INC_BIN=$(TOOL_BINPATH)data2inc$(EXEEXT) + ifeq ($(EXEEXT),.exe) # Cross-building Windows binaries requires locally installed utilities -FONTCONV_BIN=fontconv FONTCONV_DEP= -DATA2INC_BIN=data2inc DATA2INC_DEP= else -FONTCONV_BIN=$(TOOL_BINPATH)fontconv$(EXEEXT) +ifeq ($(DM_BUILD_TOOLS),yes) FONTCONV_DEP=$(FONTCONV_BIN) -DATA2INC_BIN=$(TOOL_BINPATH)data2inc$(EXEEXT) DATA2INC_DEP=$(DATA2INC_BIN) endif +endif ###