From a69ef3c13244c5269a1ad1a48fdc736493005975 Mon Sep 17 00:00:00 2001 From: Paul Selkirk Date: Tue, 22 Jan 2019 19:39:09 -0500 Subject: Upon reflection, I prefer the way Pavel handled include paths in 8cd28d0 (which he only committed on fmc_clk, and I was only looking at master). But I moved the curly brackets from Makefile to xilinx.mk, because a) Makefile shouldn't need to know the picky details of xst option syntax, and b) xst will throw an uninformative error if called with '-vlgincdir ' versus '-vlgincdir {}', if vlgincdir isn't defined in Makefile. --- build/xilinx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build/xilinx.mk') diff --git a/build/xilinx.mk b/build/xilinx.mk index c88f00b..4bfefde 100644 --- a/build/xilinx.mk +++ b/build/xilinx.mk @@ -154,8 +154,8 @@ $(project).scr: $(optfile) $(mkfiles) ./xilinx.opt echo "-top $(top_module)" >> $@ echo "-ifn $(project).prj" >> $@ echo "-ofn $(project).ngc" >> $@ + echo "-vlgincdir {$(vlgincdir)}" >> $@ cat ./xilinx.opt $(optfile) >> $@ - echo "-vlgincdir $(vlgincdir)" >> $@ junk += $(project).scr $(project).post_map.twr: $(project).ncd -- cgit v1.2.3