--- ray/src/cv/Rmakefile	2013/04/21 23:01:14	2.39
+++ ray/src/cv/Rmakefile	2025/05/21 17:23:07	2.60
@@ -1,4 +1,4 @@
-# RCSid $Id: Rmakefile,v 2.39 2013/04/21 23:01:14 greg Exp $
+# RCSid $Id: Rmakefile,v 2.60 2025/05/21 17:23:07 greg Exp $
 #
 # Makefile for conversion programs
 #
@@ -8,9 +8,11 @@ OPT = -O
 MACH = -DBSD
 
 CFLAGS = -I../common -L../lib $(OPT) $(MACH)
+CXXFLAGS = $(CFLAGS)
 METACFLAGS = -I../meta
 
 CC = cc
+CXX = c++
 
 MLIB = -lm
 
@@ -18,23 +20,25 @@ INSTDIR = /usr/local/bin
 
 LIBDIR = /usr/local/lib/ray
 
-PROGS = ies2rad nff2rad lampcolor tmesh2rad obj2rad \
+PROGS = ies2rad nff2rad lampcolor tmesh2rad obj2rad robjutil \
 mgf2rad rad2mgf mgf2meta mgfilt mgf2inv 3ds2mgf \
-pabopto2bsdf bsdf2ttree bsdf2klems pkgBSDF
+bsdfquery bsdfpeaks checkBSDF \
+pabopto2xyz pabopto2bsdf bsdf2ttree bsdf2klems pkgBSDF epw2wea bsdf2rad
 
-LIBFILES = source.cal tilt.cal lamp.tab window.cal
+LIBFILES = source.cal tilt.cal lamp.tab window.cal bsdf2rad.cal
 
 all:	$(PROGS)
 
 install:	$(PROGS) $(LIBFILES) optics2rad.csh
 	cp $(PROGS) $(INSTDIR)
 	cp optics2rad.csh $(INSTDIR)/optics2rad
-	chmod 755 $(INSTDIR)/optics2rad
+	cp iso2klems.pl $(INSTDIR)/iso2klems
+	chmod 755 $(INSTDIR)/optics2rad $(INSTDIR)/iso2klems
 	cd $(LIBDIR) && rm -f $(LIBFILES)
 	cp $(LIBFILES) $(LIBDIR)
 
 clean:
-	set nonomatch; rm -f $(PROGS) *.o core
+	set nonomatch; rm -f $(PROGS) *.o
 
 ies2rad:	ies2rad.o
 	$(CC) $(CFLAGS) -o ies2rad ies2rad.o -lrtrad $(MLIB)
@@ -73,10 +77,37 @@ mgf2inv:	mgf2inv.o
 	$(CC) $(CFLAGS) -o 3ds2mgf 3ds2mgf.o rayopt3ds.o vect3ds.o \
 -lmgf -lrtrad $(MLIB)
 
-pabopto2bsdf:	pabopto2bsdf.o bsdfrep.o bsdfrbf.o bsdfmesh.o
-	$(CC) $(CFLAGS) -o pabopto2bsdf pabopto2bsdf.o bsdfrep.o \
-bsdfrbf.o bsdfmesh.o -lrtrad $(MLIB)
+pabopto2xyz:	pabopto2xyz.o
+	$(CXX) $(CXXFLAGS) -o pabopto2xyz pabopto2xyz.o \
+-lrtrad $(MLIB)
 
+pabopto2bsdf:	pabopto2bsdf.o bsdfrep.o bsdfrbf.o bsdfmesh.o bsdftrans.o
+	$(CXX) $(CXXFLAGS) -o pabopto2bsdf pabopto2bsdf.o bsdfrep.o \
+bsdfrbf.o bsdfmesh.o bsdftrans.o -lrtrad $(MLIB)
+
+pabopto2rad:	pabopto2rad.o bsdfrep.o bsdfrbf.o 
+	$(CC) $(CFLAGS) -o pabopto2rad pabopto2rad.o bsdfrep.o \
+bsdfrbf.o -lrtrad $(MLIB)
+
+pabopto2rad.o:	pabopto2bsdf.c bsdfrep.h
+	$(CC) $(CFLAGS) -c -DTEST_MAIN -o pabopto2rad.o pabopto2bsdf.c
+
+bsdf2rad:	bsdf2rad.o bsdfrep.o bsdfinterp.o
+	$(CC) $(CFLAGS) -o bsdf2rad bsdf2rad.o bsdfrep.o bsdfinterp.o \
+-lrtrad $(MLIB)
+
+bsdf2rado:	bsdf2rado.o bsdfrep.o bsdfinterp.o
+	$(CC) $(CFLAGS) -o bsdf2rado bsdf2rado.o bsdfrep.o bsdfinterp.o \
+-lrtrad $(MLIB)
+
+bsdfquery:	bsdfquery.o bsdfrep.o bsdfinterp.o
+	$(CC) $(CFLAGS) -o bsdfquery bsdfquery.o bsdfrep.o bsdfinterp.o \
+-lrtrad $(MLIB)
+
+bsdfpeaks:	bsdfpeaks.o bsdfrep.o bsdfinterp.o
+	$(CC) $(CFLAGS) -o bsdfpeaks bsdfpeaks.o bsdfrep.o bsdfinterp.o \
+-lrtrad $(MLIB)
+
 bsdf2ttree:	bsdf2ttree.o bsdfrep.o bsdfinterp.o
 	$(CC) $(CFLAGS) -o bsdf2ttree bsdf2ttree.o bsdfrep.o bsdfinterp.o \
 -lrtrad $(MLIB)
@@ -88,6 +119,16 @@ bsdf2klems:	bsdf2klems.o bsdfrep.o bsdfinterp.o
 pkgBSDF:	pkgBSDF.o
 	$(CC) $(CFLAGS) -o pkgBSDF pkgBSDF.o -lrtrad $(MLIB)
 
+checkBSDF:	checkBSDF.o
+	$(CC) $(CFLAGS) -o checkBSDF checkBSDF.o -lrtrad $(MLIB)
+
+epw2wea:	epw2wea.o
+	$(CC) $(CFLAGS) -o epw2wea epw2wea.o
+
+robjutil:	robjutil.o
+	$(CC) $(CFLAGS) -o robjutil robjutil.o \
+-lwfobj -lrtrad $(MLIB)
+
 mgf2rad.o:	mgf2rad.c ../common/mgf_parser.h ../common/tmesh.h \
 ../common/color.h
 	$(CC) $(CFLAGS) -c mgf2rad.c
@@ -119,12 +160,28 @@ mgf2inv.o:	../common/mgf_parser.h ../common/ccolor.h
 
 3ds2mgf.o rayopt3ds.o vect3ds.o:	vect3ds.h
 
-pkgBSDF.o:	../common/bsdf.h ../common/fvect.h ../common/ccolor.h \
-../common/paths.h
+checkBSDF.o pkgBSDF.o:	../common/bsdf.h ../common/fvect.h \
+../common/ccolor.h ../common/paths.h
 
-bsdf2ttree.o bsdfinterp.o bsdfmesh.o bsdfrbf.o bsdfrep.o \
+bsdf2ttree.o bsdfinterp.o bsdfmesh.o bsdfrbf.o bsdfrep.o bsdf2rad.o bsdftrans.o \
 pabopto2bsdf.o:	bsdfrep.h ../common/bsdf.h ../common/fvect.h ../common/ccolor.h
 
 bsdf2ttree.o pabopto2bsdf.o:	../common/platform.h
 
 bsdfrep.o:	../common/resolu.h ../common/rtio.h
+
+pabopto2bsdf.o:	../common/resolu.h
+
+bsdf2rad.o bsdf2ttree.o:	../common/rtprocess.h
+
+bsdf2klems.o bsdf2ttree.o mgf2meta.o:	../common/random.h ../common/calcomp.h
+
+bsdftrans.o:	transportSimplex.h
+
+bsdfquery.o:	../common/rtmath.h ../common/rtio.h bsdfrep.h
+
+bsdfpeaks.o:	bsdfrep.h
+
+checkBSDF.o:	../common/rtio.h ../common/bsdf_m.h ../common/bsdf_t.h
+
+robjutil.o:	../common/objutil.h