--- ray/test/renders/Makefile	2020/07/29 18:45:00	1.25
+++ ray/test/renders/Makefile	2021/01/24 01:53:41	1.31
@@ -1,25 +1,29 @@
-# RCSid $Id: Makefile,v 1.25 2020/07/29 18:45:00 greg Exp $
+# RCSid $Id: Makefile,v 1.31 2021/01/24 01:53:41 greg Exp $
 #
 # Render and primitive type testing
 #
 
 # Number of processes to use on tests that run multi-core
-NPROC = 2
+ifeq ($(OS),Windows_NT)  # is Windows
+	NPROC := 1
+else
+	NPROC := 2
+endif
 
 # Image reduction for comparisons
 RDU_PFILT = pfilt -1 -r 1 -x 128 -y 128 -pa 1
 
 # Image comparison command
-IMG_CMP = radcompare -rms 0.07 -max 1.5
+IMG_CMP = radcompare -rms 0.1 -max 1.5
 
 # Default target is to test everything
 all:	test-xform test-oconv test-rad test-rfluxmtx test-rpiece \
-test-rpict test-mkpmap \
+test-rpict test-mkpmap test-prism1-fish test-prism2-fish \
 test-mixtex-def test-mixtex-fish test-mixtex-plan test-mixtex-rplan \
-test-trans2-def test-trans2-fish test-dielectric-def \
+test-trans2-def test-trans2-fish test-trans2-win test-dielectric-def \
 test-dielectric-fish test-glass-def test-glass-fish test-glass-up \
 test-tfunc-def test-tfunc-fish test-inst-def test-inst-fish \
-test-mesh-def test-mesh-cyl test-mirror-fish test-mist-def \
+test-mesh-def test-mesh-cyl test-mesh-cyl2 test-mirror-fish test-mist-def \
 test-trans-def test-trans-fish test-patterns-def test-patterns-plan \
 test-rtrace test-obj2mesh
 
@@ -377,7 +381,7 @@ trans_fish.hdr:	trans.oct
 
 ### Octree for  trans2 ###
 
-trans2.oct:	trans2.rif
+trans21.oct:	trans2.rif
 	rad -v 0  trans2.rif
 
 ### Reference and test for  trans2 view   def ###
@@ -389,7 +393,7 @@ ref/trans2_def.hdr:
 	make  trans2_def.hdr
 	$(RDU_PFILT)  trans2_def.hdr > ref/trans2_def.hdr
 
-trans2_def.hdr:	trans2.oct
+trans2_def.hdr:	trans21.oct
 	rad -v   def  trans2.rif
 
 ### End  trans2-def   tests
@@ -403,7 +407,7 @@ ref/trans2_fish.hdr:
 	make  trans2_fish.hdr
 	$(RDU_PFILT)  trans2_fish.hdr > ref/trans2_fish.hdr
 
-trans2_fish.hdr:	trans2.oct
+trans2_fish.hdr:	trans21.oct
 	rad -v  fish  trans2.rif
 
 ### End  trans2-fish  tests
@@ -417,7 +421,7 @@ ref/trans2_win.hdr:
 	make  trans2_win.hdr
 	$(RDU_PFILT)  trans2_win.hdr > ref/trans2_win.hdr
 
-trans2_win.hdr:	trans2.oct
+trans2_win.hdr:	trans21.oct
 	rad -v   win  trans2.rif
 
 ### End  trans2-win   tests