--- ray/src/gen/Rmakefile	2024/08/02 18:47:25	2.44
+++ ray/src/gen/Rmakefile	2025/05/15 16:36:43	2.51
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.44 2024/08/02 18:47:25 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.51 2025/05/15 16:36:43 greg Exp $
 #
 # Makefile for object generation programs
 #
@@ -7,6 +7,7 @@ OPT = -O
 MACH = -DBSD
 CFLAGS = -I../common -I../rt -L../lib $(OPT) $(MACH)
 CC = cc
+PTHD = -pthread
 MLIB = -lm
 
 INSTALL = cp
@@ -15,11 +16,11 @@ INSTDIR = /usr/local/bin
 
 LIBDIR = /usr/local/lib/ray
 
-PROGS = genbox gensky xform genblinds genrev genworm gendaylit gendaymtx \
+PROGS = genbox gensky xform genblinds genrev genworm gendaylit gendaymtx genglaze \
 		gensurf genprism replmarks mkillum mksource genclock genssky gensdaymtx
 
 LIBFILES = illum.cal rev.cal skybright.cal surf.cal clockface.hex \
-		glaze1.cal glaze2.cal perezlum.cal perezlum_c.cal
+		glaze1.cal glaze2.cal perezlum.cal perezlum_c.cal mie_ca.dat
 
 all:	$(PROGS)
 
@@ -48,8 +49,8 @@ gensky:	gensky.o sun.o
 gendaylit:	gendaylit.o sun.o
 	$(CC) $(CFLAGS) -o gendaylit gendaylit.o sun.o -lrtrad $(MLIB)
 
-gendaymtx:	gendaymtx.o sun.o
-	$(CC) $(CFLAGS) -o gendaymtx gendaymtx.o sun.o -lrtrad $(MLIB)
+gendaymtx:	gendaymtx.o sun.o loadEPW.o
+	$(CC) $(CFLAGS) -o gendaymtx gendaymtx.o sun.o loadEPW.o -lrtrad $(MLIB)
 
 genblinds:	genblinds.o
 	$(CC) $(CFLAGS) -o genblinds genblinds.o -lrtrad $(MLIB)
@@ -89,14 +90,17 @@ genclock:	genclock.o
 genbranch:	genbranch.o
 	$(CC) $(CFLAGS) -o genbranch genbranch.o $(MLIB)
 
-
 # Assume rt is built before this
 genssky:	genssky.o sun.o atmos.o
-	$(CC) $(CFLAGS) -o genssky genssky.o sun.o atmos.o -lrtrad $(MLIB)
+	$(CC) $(CFLAGS) $(PTHD) -o genssky genssky.o sun.o atmos.o \
+-lrtrad $(MLIB)
 
-gensdaymtx:	gensdaymtx.o sun.o atmos.o
-	$(CC) $(CFLAGS) -o gensdaymtx gensdaymtx.o sun.o atmos.o -lrtrad $(MLIB)
+gensdaymtx:	gensdaymtx.o sun.o atmos.o loadEPW.o
+	$(CC) $(CFLAGS) $(PTHD) -o gensdaymtx gensdaymtx.o sun.o atmos.o \
+loadEPW.o -lrtrad $(MLIB)
 
+genglaze: genglaze.o
+	$(CC) $(CFLAGS) -o genglaze genglaze.o -lrtrad $(MLIB)
 
 mksource.o:	../common/random.h ../rt/ray.h ../common/octree.h \
 ../common/object.h ../common/color.h \
@@ -124,6 +128,8 @@ mkillum.o mkillum2.o mkillum3.o:	mkillum.h \
 ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
 ../common/rterror.h ../common/random.h
 
+loadEPW.o:	../common/rtio.h loadEPW.h
+
 mkillum2.o:	../rt/source.h ../common/face.h ../common/cone.h
 
 mkillum2.o mkillum3.o:	../common/paths.h
@@ -135,10 +141,13 @@ gensurf.o genworm.o genrev.o:	../common/calcomp.h
 gendaylit.o gensky.o sun.o:	sun.h
 
 gendaymtx.o:	../common/platform.h ../common/rtmath.h \
-../common/mat4.h ../common/fvect.h ../common/color.h
+../common/mat4.h ../common/fvect.h ../common/color.h loadEPW.h
 
-genssky.o: ../common/rtio.h ../common/rtmath.h \
+genssky.o:	../common/rtio.h ../common/rtmath.h \
 ../common/paths.h ../common/color.h
 
-atmos.o: ../common/rtio.h ../common/rtmath.h ../common/color.h \
+genssky.o gensdaymtx.o:	atmos.h loadEPW.h
+
+atmos.o:	../common/rtio.h ../common/rtmath.h ../common/color.h \
 ../common/data.h sun.h
+	$(CC) $(CFLAGS) $(PTHD) -c atmos.c