# HG changeset patch # User Matti Hamalainen # Date 1530459945 -10800 # Node ID 8d62ca2c06841b268c7fb28f9de051cdddbb6f88 # Parent 1054396a7d53a390c69418df02708a313e82a090 Fix PPL cross-build. diff -r 1054396a7d53 -r 8d62ca2c0684 Makefile.gen --- 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)