--- ray/src/gen/Rmakefile 2011/10/22 22:38:10 2.28 +++ ray/src/gen/Rmakefile 2014/05/30 00:00:54 2.34 @@ -1,4 +1,4 @@ -# RCSid: $Id: Rmakefile,v 2.28 2011/10/22 22:38:10 greg Exp $ +# RCSid: $Id: Rmakefile,v 2.34 2014/05/30 00:00:54 greg Exp $ # # Makefile for object generation programs # @@ -13,11 +13,11 @@ INSTDIR = /usr/local/bin LIBDIR = /usr/local/lib/ray -PROGS = genbox gensky xform genblinds genrev genworm gendaylit \ +PROGS = genbox gensky xform genblinds genrev genworm gendaylit gendaymtx \ gensurf genprism replmarks mkillum mksource genclock LIBFILES = illum.cal rev.cal skybright.cal surf.cal clockface.hex \ - glaze1.cal glaze2.cal perezlum.cal coeff_perez.dat defangle.dat + glaze1.cal glaze2.cal perezlum.cal all: $(PROGS) @@ -29,7 +29,7 @@ install: $(PROGS) $(LIBFILES) glaze.csh cp $(LIBFILES) $(LIBDIR) clean: - set nonomatch; rm -f $(PROGS) *.o core + set nonomatch; rm -f $(PROGS) *.o genbeads: genbeads.o hermite3.o $(CC) $(CFLAGS) -o genbeads genbeads.o hermite3.o $(MLIB) @@ -46,8 +46,8 @@ gensky: gensky.o sun.o gendaylit: gendaylit.o sun.o $(CC) $(CFLAGS) -o gendaylit gendaylit.o sun.o -lrtrad $(MLIB) -# gendaylit: H32_gendaylit.o -# $(CC) $(CFLAGS) -o gendaylit H32_gendaylit.o $(MLIB) +gendaymtx: gendaymtx.o sun.o + $(CC) $(CFLAGS) -o gendaymtx gendaymtx.o sun.o -lrtrad $(MLIB) genblinds: genblinds.o $(CC) $(CFLAGS) -o genblinds genblinds.o $(MLIB) @@ -104,7 +104,7 @@ genworm.o genrev.o gensurf.o: ../common/resolu.h ../co xform.o: ../common/otypes.h ../common/object.h -mkillum.o mkillum2.o mkillum3.o: mkillum.h ../common/bsdf.h \ +mkillum.o mkillum2.o mkillum3.o: mkillum.h \ ../common/otypes.h ../rt/ray.h ../common/octree.h \ ../common/object.h ../common/color.h \ ../common/standard.h ../common/rtmisc.h ../common/rtio.h \ @@ -118,3 +118,8 @@ mkillum2.o mkillum3.o: ../common/paths.h gensky.o: ../common/color.h gensurf.o genworm.o genrev.o: ../common/calcomp.h + +sun.o: sun.h + +gendaymtx.o: ../common/platform.h ../common/rtmath.h \ +../common/mat4.h ../common/fvect.h ../common/color.h