chiark
/
gitweb
/
~ianmdlvl
/
reprap-play.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2476780
)
Makefile: load base .slic3r file too
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 10 Jan 2015 22:38:36 +0000
(22:38 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 10 Jan 2015 22:38:36 +0000
(22:38 +0000)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index 0e94734ae58dd9c9b72e53a74746eedd5188f38c..70905bcf29754cdaae5d097fa62c482cd25d41e2 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-33,9
+33,13
@@
stls: $(addsuffix .auto.stl, $(AUTO_TOPLEVELS))
@rm .$@.d.tmp
mv -f $*.tmp.stl $@
+AUTOBASE=$(shell echo $(1) | perl -pe 's/,\w+\.auto$$//')
+
%.gcode: %.stl $(CONFIG)
$(SLIC3R) --load $(CONFIG) \
- --ignore-nonexistent-config --load $*.slic3r \
+ --ignore-nonexistent-config \
+ --load $(call AUTOBASE,$*).slic3r \
+ --load $*.slic3r \
--output $@.tmp $<
@mv -f $@.tmp $@