--- ray/src/util/Rmakefile 2013/12/04 20:07:07 2.63 +++ ray/src/util/Rmakefile 2014/02/10 04:51:26 2.68 @@ -1,4 +1,4 @@ -# RCSid: $Id: Rmakefile,v 2.63 2013/12/04 20:07:07 greg Exp $ +# RCSid: $Id: Rmakefile,v 2.68 2014/02/10 04:51:26 greg Exp $ # # Radiance makefile for utility programs # @@ -20,7 +20,8 @@ INSTDIR = /usr/local/bin LIBDIR = /usr/local/lib/ray PROGS = findglare glarendx rpiece rad ranimate ranimove vwright getinfo \ - vwrays xglaresrc rsensor dctimestep rttree_reduce rcollate + vwrays xglaresrc rsensor dctimestep rttree_reduce rcollate \ + eplus_adduvf all: $(PROGS) @@ -104,8 +105,9 @@ glrad: glrad.o $(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrtrad -lGLU -lGL \ -lX11 -lXext $(MLIB) -dctimestep: dctimestep.o - $(CC) $(CFLAGS) -o dctimestep dctimestep.o -lrtrad $(MLIB) +dctimestep: dctimestep.o cmbsdf.o cmatrix.o + $(CC) $(CFLAGS) -o dctimestep dctimestep.o cmbsdf.o cmatrix.o \ +-lrtrad $(MLIB) rttree_reduce: rttree_reduce.o $(CC) $(CFLAGS) -o rttree_reduce rttree_reduce.o -lrtrad $(MLIB) @@ -113,8 +115,18 @@ rttree_reduce: rttree_reduce.o rcollate: rcollate.o $(CC) $(CFLAGS) -o rcollate rcollate.o -lrtrad +eplus_adduvf: eplus_adduvf.o eplus_idf.o + $(CC) $(CFLAGS) -o eplus_adduvf eplus_adduvf.o eplus_idf.o -lrtrad + setscan.o: setscan.h +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 + +eplus_adduvf.o eplus_idf.o: eplus_idf.h \ +../common/lookup.h + findglare.o glareval.o \ glaresrc.o: glare.h ../common/standard.h \ ../common/rtmisc.h ../common/rtio.h \ @@ -128,8 +140,18 @@ rpiece.o: ../common/color.h ../common/view.h ../common dctimestep.o: ../common/standard.h \ ../common/rtmisc.h ../common/rtio.h \ ../common/rtmath.h ../common/mat4.h ../common/fvect.h \ -../common/rterror.h ../common/platform.h ../common/paths.h \ -../common/color.h ../common/bsdf.h ../common/bsdf_m.h ../common/resolu.h +../common/rterror.h ../common/resolu.h + +dctimestep.o cmatrix.o cmbsdf.o: cmatrix.h ../common/color.h + +cmatrix.o cmbsdf.o: ../common/standard.h \ +../common/rtmisc.h ../common/rtio.h \ +../common/rtmath.h ../common/mat4.h ../common/fvect.h \ +../common/rterror.h + +cmbsdf.o: ../common/paths.h ../common/bsdf.h ../common/bsdf_m.h + +dctimestep.o cmatrix.o: ../common/platform.h rtcontrib.o: ../common/platform.h ../common/rtprocess.h \ ../common/color.h ../common/resolu.h ../common/lookup.h \