X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=5fad8d0a136e6bbf4eee99c8133f0a659944175a;hb=4513d15d4bc1dcacd1babbdbdbd01669b4f022d8;hp=8654e5b0d1180124ec3f227f129f812a59738d99;hpb=9290c3e754ce326a16d15d8f033897cf97be6897;p=reprap-play.git diff --git a/Makefile b/Makefile index 8654e5b..5fad8d0 100644 --- a/Makefile +++ b/Makefile @@ -6,9 +6,9 @@ SKEINFORGE=python $(HRR)/reprappro-software.git/skeinforge/skeinforge_applicatio CWD := $(shell pwd) PLAY ?= $(CWD) -CONFIG=slic3r-config.ini +CONFIG=$(PLAY)/slic3r-config.ini -USING_AUTOS ?= filamentspool xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover anglepoise-neck.scad +USING_AUTOS ?= filamentspool xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover anglepoise-neck crossbar-computer-led-mount AUTO_TOPLEVELS := $(foreach m,$(USING_AUTOS),$(shell $(PLAY)/toplevel-find $m)) scads: $(addsuffix .auto.scad, $(AUTO_TOPLEVELS)) @@ -30,7 +30,7 @@ default: @rm .$@.d.tmp mv -f $*.tmp.stl $@ -%.gcode: %.stl $(CONFIG) +%.gcode: %.stl %.slic3r $(CONFIG) $(SLIC3R) --load $(CONFIG) \ --ignore-nonexistent-config --load $*.slic3r \ --output $@.tmp $<