--- ray/src/util/Rmakefile 2019/07/26 00:34:07 2.92 +++ ray/src/util/Rmakefile 2019/09/10 17:25:02 2.97 @@ -1,4 +1,4 @@ -# RCSid: $Id: Rmakefile,v 2.92 2019/07/26 00:34:07 greg Exp $ +# RCSid: $Id: Rmakefile,v 2.97 2019/09/10 17:25:02 greg Exp $ # # Radiance makefile for utility programs # @@ -22,7 +22,7 @@ LIBDIR = /usr/local/lib/ray PROGS = findglare glarendx rpiece rad ranimate ranimove vwright getinfo \ vwrays xglaresrc rsensor dctimestep rttree_reduce rcollate \ eplus_adduvf rfluxmtx rmtxop wrapBSDF evalglare radcompare \ - rcode_depth rcode_norm rcode_ident + rcode_depth rcode_norm rcode_ident dcglare LIBFILES = rambpos.cal ambpos.cal tregsamp.dat reinhartb.cal \ klems_full.cal klems_half.cal klems_quarter.cal disk2square.cal \ @@ -58,7 +58,7 @@ genskyvec.pl genBSDF.pl bsdfview.pl rtpict.pl rcode2bm cd $(INSTDIR) ; chmod 755 objview objpict \ glare dayfact debugcal rlux raddepend objline \ compamb vinfo genambpos fieldcomb genklemsamp \ - genskyvec genBSDF rtpict + genskyvec genBSDF rtpict rcode2bmp cd $(LIBDIR) && rm -f $(LIBFILES) cp $(LIBFILES) $(LIBDIR) csh -f tradinstall.csh $(INSTDIR) $(LIBDIR)/tcl @@ -146,17 +146,21 @@ radcompare: radcompare.o setscan.o: setscan.h -rcode_depth: rcode_depth.o depthcodec.o - $(CC) $(CFLAGS) -o rcode_depth rcode_depth.o depthcodec.o \ +rcode_depth: rcode_depth.o + $(CC) $(CFLAGS) -o rcode_depth rcode_depth.o \ -lrtrad $(MLIB) -rcode_norm: rcode_norm.o normcodec.o - $(CC) $(CFLAGS) -o rcode_norm rcode_norm.o normcodec.o \ +rcode_norm: rcode_norm.o + $(CC) $(CFLAGS) -o rcode_norm rcode_norm.o \ -lrtrad $(MLIB) -rcode_ident: rcode_ident.o idmap.o - $(CC) $(CFLAGS) -o rcode_ident rcode_ident.o idmap.o -lrtrad +rcode_ident: rcode_ident.o + $(CC) $(CFLAGS) -o rcode_ident rcode_ident.o -lrtrad +dcglare: dcglare.o cmbsdf.o cmatrix.o cmglare.o + $(CC) $(CFLAGS) -o dcglare dcglare.o cmbsdf.o cmatrix.o cmglare.o \ +-lrtrad $(MLIB) + eplus_adduvf.o: ../common/triangulate.h ../common/rtprocess.h \ ../common/paths.h ../common/rtio.h ../common/random.h \ ../common/rtmath.h ../common/mat4.h ../common/fvect.h @@ -194,7 +198,7 @@ rfluxmtx.o: ../common/rtio.h ../common/random.h ../com rmtxop.o dctimestep.o cmatrix.o: ../common/platform.h -rad.o ranimate.o rpiece.o xglaresrc.o: ../common/standard.h \ +dcglare.o rad.o ranimate.o rpiece.o xglaresrc.o: ../common/standard.h \ ../common/rtmisc.h ../common/rtio.h \ ../common/rtmath.h ../common/mat4.h ../common/fvect.h \ ../common/rterror.h @@ -242,7 +246,7 @@ rsensor.o: ../rt/ray.h ../common/octree.h \ rsensor.o: ../common/view.h ../common/resolu.h ../rt/source.h -radcompare.o rcollate.o: ../common/platform.h \ + rcollate.o: ../common/platform.h \ ../common/rtio.h ../common/resolu.h Version.c: ../rt/Version.c @@ -265,24 +269,23 @@ pictool.o evalglare.o: pictool.h ../common/g3vector.h evalglare.o: ../common/rtio.h -radcompare.o: ../common/rtio.h ../common/color.h ../common/lookup.h +radcompare.o: ../common/rtio.h ../common/color.h ../common/lookup.h \ +../common/platform.h ../common/normcodec.h ../common/depthcodec.h \ +../common/rtmath.h ../common/view.h pictool.o: ../common/view.h ../common/color.h getinfo.o: ../common/rtprocess.h ../common/platform.h ../common/resolu.h -rcode_depth.o depthcodec.o: depthcodec.h \ -../common/view.h ../common/fvect.h ../common/resolu.h ../common/rtio.h +rcode_depth.o: ../common/depthcodec.h \ +../common/view.h ../common/fvect.h ../common/resolu.h ../common/rtio.h \ +../common/platform.h -rcode_depth.o: ../common/platform.h - -rcode_norm.o normcodec.o: normcodec.h \ +rcode_norm.o: ../common/normcodec.h \ ../common/rtmath.h ../common/mat4.h ../common/fvect.h \ -../common/resolu.h ../common/rtio.h +../common/resolu.h ../common/rtio.h ../common/platform.h -rcode_norm.o: ../common/platform.h +rcode_ident.o: ../common/idmap.h ../common/resolu.h \ +../common/platform.h ../common/rtio.h ../common/lookup.h -rcode_ident.o idmap.o: idmap.h ../common/resolu.h \ -../common/platform.h ../common/rtio.h - -rcode_ident.o: ../common/lookup.h +dcglare.o: ../common/platform.h ../common/resolu.h cmglare.h