Mercurial > hg > dmlib

changeset 1989:8d62ca2c0684

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix PPL cross-build.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 01 Jul 2018 18:45:45 +0300
parents 1054396a7d53
children a183d8649a85
files Makefile.gen
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.gen	Sun Jul 01 18:41:25 2018 +0300
+++ b/Makefile.gen	Sun Jul 01 18:45:45 2018 +0300
@@ -11,8 +11,11 @@
 MKDIR_P ?= $(MKDIR) -p
 BINPATH ?= ./
 DMLIB ?= ./
-TOOL_BINPATH ?= $(DMLIB)tools/
-TESTS_BINPATH ?= $(DMLIB)tests/
+TOOL_SRCPATH = $(DMLIB)tools/
+TESTS_SRCPATH = $(DMLIB)tests/
+
+TOOL_BINPATH ?= $(TOOL_SRCPATH)
+TESTS_BINPATH ?= $(TESTS_SRCPATH)
 
 DMLIBSRC = $(DMLIB)src/
 
@@ -481,7 +484,7 @@
 	@echo " LINK $+"
 	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(ZLIB_LDFLAGS)
 
-$(OBJPATH)ppl.o: $(TOOL_BINPATH)ppl.c $(MINIJSS)jssplr.h $(MINIJSS)jss.h $(MINIJSS)jssmod.h $(MINIJSS)jssmix.h $(DMLIBSRC)setupfont.h
+$(OBJPATH)ppl.o: $(TOOL_SRCPATH)ppl.c $(MINIJSS)jssplr.h $(MINIJSS)jss.h $(MINIJSS)jssmod.h $(MINIJSS)jssmix.h $(DMLIBSRC)setupfont.h
 	@echo " CC $+"
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)