From 2311bdf24f00d956ce57db799321f02c2749a366 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 9 Dec 2014 17:53:44 +0100 Subject: [PATCH] AssembleNasm: add source dir to include path. This makes it possible to %include local files. nasm doesn't allow this otherwise (include paths are assumed relative to the working directory). Fixes build of ape_reader. --- build/jam/MainBuildRules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules index 7fd8a76abd..6d99569f0b 100644 --- a/build/jam/MainBuildRules +++ b/build/jam/MainBuildRules @@ -179,9 +179,9 @@ rule AssembleNasm actions AssembleNasm { if test $(ASFLAGS) ; then - $(HAIKU_NASM) -d $(ASFLAGS) $(NASMFLAGS) -o $(1) $(2); + $(HAIKU_NASM) -d $(ASFLAGS) $(NASMFLAGS) -I$(2:D)/ -o $(1) $(2) ; else - $(HAIKU_NASM) $(NASMFLAGS) -o $(1) $(2); + $(HAIKU_NASM) $(NASMFLAGS) -I$(2:D)/ -o $(1) $(2) ; fi }