Improved dice

1 files changed, 14 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index 189df81..bacf109 100644
--- a/Makefile
+++ b/Makefile
@@ -5,9 +5,13 @@ CONFDIR=conf
 SLIC3R=~/opt/Slic3r/bin/slic3r
 
 SUITES=suns moons crowns arms
-#SUITES=clubs diamonds hearts spades
+#SUITES=suns moons crowns arms         # Basic piecepack
+SUITES=clubs diamonds hearts spades   # Playing cards expansion
 VALUES=null ace 2 3 4 5
 
+all: tiles coins dice pawns saucers pyramids
+.PHONY : all
+
 tiles:
 	mkdir -p ${DESTDIR}
 	for SUITE in ${SUITES}; do \
@@ -29,11 +33,16 @@ coins:
 dice:
 	mkdir -p ${DESTDIR}
 	for SUITE in ${SUITES}; do \
-	    openscad -o ${DESTDIR}/die-$$SUITE.stl \
-	    -D suite=\"$$SUITE\" src/die.scad; \
+	    for S in 12 16; do \
+		openscad -o ${DESTDIR}/die-$$SUITE-$$S.stl \
+		-D suite=\"$$SUITE\" -D s=$$S src/die.scad; \
+	    done \
+	done
+	for S in 12 16; do \
+	    openscad -o ${DESTDIR}/suite_die-$$S.stl \
+		-D suite='["'`echo ${SUITES} | sed 's/ /","/g'`'"]' \
+		-D s-$$S src/suite_die.scad; \
 	done
-	openscad -o ${DESTDIR}/suite_die.stl \
-	    -D suite='["'`echo ${SUITES} | sed 's/ /","/g'`'"]' src/suite_die.scad
 
 pawns:
 	mkdir -p ${DESTDIR}
@@ -77,4 +86,3 @@ gcode: tiles coins dice saucers pyramids
 	    ${SLIC3R} --load ${CONFDIR}/pyramids.ini $$T; \
 	done 
 
-all: tiles coins dice pawns saucers pyramids