--- ray/src/util/Rmakefile 2025/03/27 01:26:55 2.108 +++ ray/src/util/Rmakefile 2025/10/24 16:31:18 2.111 @@ -1,4 +1,4 @@ -# RCSid: $Id: Rmakefile,v 2.108 2025/03/27 01:26:55 greg Exp $ +# RCSid: $Id: Rmakefile,v 2.111 2025/10/24 16:31:18 greg Exp $ # # Radiance makefile for utility programs # @@ -117,9 +117,9 @@ glrad: glrad.o $(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrtrad -lGLU -lGL \ -lX11 -lXext $(MLIB) -dctimestep: dctimestep.o cmbsdf.o cmatrix.o - $(CC) $(CFLAGS) -o dctimestep dctimestep.o cmbsdf.o cmatrix.o \ --lrtrad $(MLIB) +dctimestep: dctimestep.o cmbsdf.o cmconst.o cmatrix.o + $(CC) $(CFLAGS) -o dctimestep dctimestep.o cmbsdf.o \ +cmconst.o cmatrix.o -lrtrad $(MLIB) rttree_reduce: rttree_reduce.o $(CC) $(CFLAGS) -o rttree_reduce rttree_reduce.o -lrtrad $(MLIB) @@ -134,16 +134,16 @@ eplus_adduvf: eplus_adduvf.o eplus_idf.o rfluxmtx: rfluxmtx.o $(CC) $(CFLAGS) -o rfluxmtx rfluxmtx.o -lrtrad $(MLIB) -rmtxop: rmtxop.o rmatrix.o cmatrix.o cmbsdf.o +rmtxop: rmtxop.o cmconst.o rmatrix.o cmatrix.o cmbsdf.o rmconvert.o $(CC) $(CFLAGS) -o rmtxop rmtxop.o rmatrix.o cmatrix.o cmbsdf.o \ --lrtrad $(MLIB) +cmconst.o rmconvert.o -lrtrad $(MLIB) -rcomb: rcomb.o rmatrix.o cmatrix.o cmbsdf.o - $(CC) $(CFLAGS) -o rcomb rcomb.o rmatrix.o cmatrix.o cmbsdf.o \ +rcomb: rcomb.o cmconst.o rmatrix.o + $(CC) $(CFLAGS) -o rcomb rcomb.o cmconst.o rmatrix.o \ -lrtrad $(MLIB) -pvsum: pvsum.o rmatrix.o cmatrix.o cmbsdf.o - $(CC) $(CFLAGS) -o pvsum pvsum.o rmatrix.o cmatrix.o cmbsdf.o \ +pvsum: pvsum.o cmconst.o rmatrix.o + $(CC) $(CFLAGS) -o pvsum pvsum.o cmconst.o rmatrix.o \ -lrtrad $(MLIB) wrapBSDF: wrapBSDF.o @@ -171,9 +171,9 @@ rcode_ident: rcode_ident.o rcrop: rcrop.o $(CC) $(CFLAGS) -o rcrop rcrop.o -lrtrad -lm -dcglare: dcglare.o cmbsdf.o cmatrix.o cmglare.o - $(CC) $(CFLAGS) -o dcglare dcglare.o cmbsdf.o cmatrix.o cmglare.o \ --lrtrad $(MLIB) +dcglare: dcglare.o cmbsdf.o cmconst.o cmatrix.o cmglare.o + $(CC) $(CFLAGS) -o dcglare dcglare.o cmbsdf.o cmconst.o cmatrix.o \ +cmglare.o -lrtrad $(MLIB) rcomb.o: ../common/calcomp.h \ ../common/paths.h ../common/rtprocess.h @@ -231,6 +231,8 @@ rad.o ranimate.o: ../common/vars.h ranimove1.o ranimove2.o vwrays.o: ../common/random.h +pvsum.o: ../common/random.h ../common/platform.h ../common/paths.h + rad.o: ../common/paths.h ranimate.o netproc.o: netproc.h @@ -275,10 +277,10 @@ x11findwind.c: ../common/x11findwind.c rttree_reduce.o: ../common/rtio.h ../common/rterror.h -rmatrix.o: rmatrix.h cmatrix.h ../common/resolu.h +rmatrix.o: rmatrix.h cmatrix.h ../common/resolu.h ../common/color.h pvsum.o rcomb.o rmtxop.o: rmatrix.h cmatrix.h \ -../common/rtio.h ../common/resolu.h +../common/rtio.h ../common/resolu.h ../common/color.h wrapBSDF.o: ../common/rtio.h ../common/rtprocess.h ../common/ezxml.h \ ../common/bsdf.h ../common/bsdf_m.h ../common/fvect.h ../common/ccolor.h