--- ray/src/util/Rmakefile 2019/07/19 02:18:44 2.90 +++ ray/src/util/Rmakefile 2019/09/05 17:35:44 2.95 @@ -1,4 +1,4 @@ -# RCSid: $Id: Rmakefile,v 2.90 2019/07/19 02:18:44 greg Exp $ +# RCSid: $Id: Rmakefile,v 2.95 2019/09/05 17:35:44 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_depth rcode_norm rcode_ident LIBFILES = rambpos.cal ambpos.cal tregsamp.dat reinhartb.cal \ klems_full.cal klems_half.cal klems_quarter.cal disk2square.cal \ @@ -33,7 +33,7 @@ all: $(PROGS) install: all $(SPECIAL) objview.pl objpict.pl glare.csh dayfact.csh \ 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 $(LIBFILES) +genskyvec.pl genBSDF.pl bsdfview.pl rtpict.pl rcode2bmp.pl $(LIBFILES) cp $(PROGS) $(INSTDIR) cp objview.pl $(INSTDIR)/objview cp objline.csh $(INSTDIR)/objline @@ -54,10 +54,11 @@ genskyvec.pl genBSDF.pl bsdfview.pl rtpict.pl $(LIBFIL cp ltview.pl $(INSTDIR)/ltview cp ltpict.pl $(INSTDIR)/ltpict cp rtpict.pl $(INSTDIR)/rtpict + cp rcode2bmp.pl $(INSTDIR)/rcode2bmp 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 @@ -145,14 +146,17 @@ 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 + $(CC) $(CFLAGS) -o rcode_ident rcode_ident.o -lrtrad + 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 @@ -238,7 +242,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 @@ -261,20 +265,21 @@ 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: ../common/normcodec.h \ +../common/rtmath.h ../common/mat4.h ../common/fvect.h \ +../common/resolu.h ../common/rtio.h ../common/platform.h -rcode_norm.o normcodec.o: normcodec.h \ - ../common/rtmath.h ../common/mat4.h ../common/fvect.h \ - ../common/resolu.h ../common/rtio.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