--- ray/src/gen/Rmakefile	2008/06/24 02:01:20	2.22
+++ ray/src/gen/Rmakefile	2025/05/15 16:36:43	2.51
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.22 2008/06/24 02:01:20 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.51 2025/05/15 16:36:43 greg Exp $
 #
 # Makefile for object generation programs
 #
@@ -7,47 +7,56 @@ OPT = -O
 MACH = -DBSD
 CFLAGS = -I../common -I../rt -L../lib $(OPT) $(MACH)
 CC = cc
+PTHD = -pthread
 MLIB = -lm
 
+INSTALL = cp
+
 INSTDIR = /usr/local/bin
 
 LIBDIR = /usr/local/lib/ray
 
-PROGS = genbox gensky xform genblinds genrev genworm \
-		gensurf genprism replmarks mkillum mksource genclock
+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
+		glaze1.cal glaze2.cal perezlum.cal perezlum_c.cal mie_ca.dat
 
 all:	$(PROGS)
 
 install:	$(PROGS) $(LIBFILES) glaze.csh
-	cp $(PROGS) $(INSTDIR)
+	$(INSTALL) $(PROGS) $(INSTDIR)
 	cp glaze.csh $(INSTDIR)/glaze
 	chmod 755 $(INSTDIR)/glaze
 	cd $(LIBDIR) && rm -f $(LIBFILES)
 	cp $(LIBFILES) $(LIBDIR)
 
 clean:
-	set nonomatch; rm -f $(PROGS) *.o core
+	set nonomatch; rm -f $(PROGS) *.o
 
 genbeads:	genbeads.o hermite3.o
 	$(CC) $(CFLAGS) -o genbeads genbeads.o hermite3.o $(MLIB)
 
 genbox:	genbox.o
-	$(CC) $(CFLAGS) -o genbox genbox.o
+	$(CC) $(CFLAGS) -o genbox genbox.o -lwfobj -lrtrad $(MLIB)
 
 genmarble:	genmarble.o ../common/random.h
 	$(CC) $(CFLAGS) -o genmarble genmarble.o $(MLIB)
 
 gensky:	gensky.o sun.o
-	$(CC) $(CFLAGS) -o gensky gensky.o sun.o $(MLIB)
+	$(CC) $(CFLAGS) -o gensky gensky.o sun.o -lrtrad $(MLIB)
 
+gendaylit:	gendaylit.o sun.o
+	$(CC) $(CFLAGS) -o gendaylit gendaylit.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 $(MLIB)
+	$(CC) $(CFLAGS) -o genblinds genblinds.o -lrtrad $(MLIB)
 
 genprism:	genprism.o
-	$(CC) $(CFLAGS) -o genprism genprism.o $(MLIB)
+	$(CC) $(CFLAGS) -o genprism genprism.o -lrtrad $(MLIB)
 
 xform:	xform.o
 	$(CC) $(CFLAGS) -o xform xform.o -lrtrad $(MLIB)
@@ -55,15 +64,15 @@ xform:	xform.o
 replmarks:	replmarks.o
 	$(CC) $(CFLAGS) -o replmarks replmarks.o -lrtrad $(MLIB)
 
-mkillum:	mkillum.o mkillum2.o mkillum3.o mkillum4.o ezxml.o
+mkillum:	mkillum.o mkillum2.o mkillum3.o
 	$(CC) $(CFLAGS) -o mkillum mkillum.o mkillum2.o mkillum3.o \
-mkillum4.o ezxml.o -lraycalls -lradiance -lrtrad $(MLIB)
+-lraycalls -lradiance -lrtrad $(MLIB)
 
 mksource:	mksource.o
 	$(CC) $(CFLAGS) -o mksource mksource.o \
 -lraycalls -lradiance -lrtrad $(MLIB)
 
-genrev:	genrev.o 
+genrev:	genrev.o
 	$(CC) $(CFLAGS) -o genrev genrev.o -lrtrad $(MLIB)
 
 gencatenary: gencat.o
@@ -81,6 +90,18 @@ 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) $(PTHD) -o genssky genssky.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 \
 ../common/standard.h ../common/rtmisc.h ../common/rtio.h \
@@ -94,23 +115,39 @@ gensurf.o xform.o:	../common/standard.h \
 ../common/rtmath.h ../common/rterror.h \
 ../common/mat4.h ../common/fvect.h
 
+genbox.o:	../common/fvect.h ../common/objutil.h ../common/rtio.h
+
 genworm.o genrev.o gensurf.o:	../common/resolu.h ../common/rterror.h
 
 xform.o:	../common/otypes.h ../common/object.h
 
-mkillum.o mkillum2.o mkillum3.o mkillum4.o:	mkillum.h \
+mkillum.o mkillum2.o mkillum3.o:	mkillum.h \
 ../common/otypes.h ../rt/ray.h ../common/octree.h \
 ../common/object.h ../common/color.h \
 ../common/standard.h ../common/rtmisc.h ../common/rtio.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
 
-mkillum3.o mkillum4.o:	../common/paths.h
+mkillum2.o mkillum3.o:	../common/paths.h
 
-ezxml.o mkillum4.o:	ezxml.h
-
 gensky.o:	../common/color.h
 
 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 loadEPW.h
+
+genssky.o:	../common/rtio.h ../common/rtmath.h \
+../common/paths.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