--- ray/src/util/Rmakefile 2019/09/10 17:25:02 2.97 +++ ray/src/util/Rmakefile 2023/02/09 00:18:05 2.102 @@ -1,4 +1,4 @@ -# RCSid: $Id: Rmakefile,v 2.97 2019/09/10 17:25:02 greg Exp $ +# RCSid: $Id: Rmakefile,v 2.102 2023/02/09 00:18:05 greg Exp $ # # Radiance makefile for utility programs # @@ -15,6 +15,8 @@ CC = cc SPECIAL = +INSTALL = cp + INSTDIR = /usr/local/bin LIBDIR = /usr/local/lib/ray @@ -22,11 +24,11 @@ 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 dcglare + rcode_depth rcode_norm rcode_ident dcglare rcrop LIBFILES = rambpos.cal ambpos.cal tregsamp.dat reinhartb.cal \ klems_full.cal klems_half.cal klems_quarter.cal disk2square.cal \ -minimalBSDFt.xml WINDOW6BSDFt.xml +hsv_rgb.cal minimalBSDFt.xml WINDOW6BSDFt.xml all: $(PROGS) @@ -34,7 +36,7 @@ install: all $(SPECIAL) objview.pl objpict.pl glare.cs rlux.csh raddepend.csh trad.wsh objline.csh compamb.csh vinfo.csh \ ltview.pl ltpict.pl genambpos.pl fieldcomb.csh genklemsamp.pl \ genskyvec.pl genBSDF.pl bsdfview.pl rtpict.pl rcode2bmp.pl $(LIBFILES) - cp $(PROGS) $(INSTDIR) + $(INSTALL) $(PROGS) $(INSTDIR) cp objview.pl $(INSTDIR)/objview cp objline.csh $(INSTDIR)/objline cp objpict.pl $(INSTDIR)/objpict @@ -58,7 +60,8 @@ 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 rcode2bmp + genskyvec genBSDF rtpict rcode2bmp bsdfview \ + ltview ltpict cd $(LIBDIR) && rm -f $(LIBFILES) cp $(LIBFILES) $(LIBDIR) csh -f tradinstall.csh $(INSTDIR) $(LIBDIR)/tcl @@ -157,6 +160,9 @@ rcode_norm: rcode_norm.o rcode_ident: rcode_ident.o $(CC) $(CFLAGS) -o rcode_ident rcode_ident.o -lrtrad +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) @@ -194,7 +200,8 @@ cmbsdf.o: ../common/paths.h ../common/bsdf.h ../common rfluxmtx.o: ../common/rtio.h ../common/random.h ../common/triangulate.h \ ../common/rtmath.h ../common/fvect.h ../common/mat4.h ../common/tiff.h \ -../common/platform.h ../common/bsdf.h ../common/bsdf_m.h ../common/rtprocess.h +../common/platform.h ../common/bsdf.h ../common/bsdf_m.h \ +../common/paths.h ../common/rtprocess.h rmtxop.o dctimestep.o cmatrix.o: ../common/platform.h @@ -289,3 +296,6 @@ rcode_ident.o: ../common/idmap.h ../common/resolu.h \ ../common/platform.h ../common/rtio.h ../common/lookup.h dcglare.o: ../common/platform.h ../common/resolu.h cmglare.h + +rcrop.o: ../common/platform.h ../common/resolu.h \ +../common/color.h ../common/fvect.h ../common/view.h ../common/rtio.h