| 8 |  | MACH = -DBSD | 
| 9 |  |  | 
| 10 |  | CFLAGS = -I../common -L../lib $(OPT) $(MACH) | 
| 11 | + | CXXFLAGS = $(CFLAGS) | 
| 12 |  | METACFLAGS = -I../meta | 
| 13 |  |  | 
| 14 |  | CC = cc | 
| 15 | + | CXX = c++ | 
| 16 |  |  | 
| 17 |  | MLIB = -lm | 
| 18 |  |  | 
| 20 |  |  | 
| 21 |  | LIBDIR = /usr/local/lib/ray | 
| 22 |  |  | 
| 23 | < | PROGS = ies2rad nff2rad lampcolor tmesh2rad obj2rad \ | 
| 24 | < | mgf2rad rad2mgf mgf2meta mgfilt mgf2inv 3ds2mgf \ | 
| 25 | < | pabopto2bsdf bsdf2ttree bsdf2klems pkgBSDF epw2wea | 
| 23 | > | PROGS = ies2rad nff2rad lampcolor tmesh2rad obj2rad robjutil \ | 
| 24 | > | mgf2rad rad2mgf mgf2meta mgfilt mgf2inv 3ds2mgf bsdfquery checkBSDF \ | 
| 25 | > | pabopto2xyz pabopto2bsdf bsdf2ttree bsdf2klems pkgBSDF epw2wea bsdf2rad | 
| 26 |  |  | 
| 27 | < | LIBFILES = source.cal tilt.cal lamp.tab window.cal | 
| 27 | > | LIBFILES = source.cal tilt.cal lamp.tab window.cal bsdf2rad.cal | 
| 28 |  |  | 
| 29 |  | all:    $(PROGS) | 
| 30 |  |  | 
| 31 |  | install:        $(PROGS) $(LIBFILES) optics2rad.csh | 
| 32 |  | cp $(PROGS) $(INSTDIR) | 
| 33 |  | cp optics2rad.csh $(INSTDIR)/optics2rad | 
| 34 | < | chmod 755 $(INSTDIR)/optics2rad | 
| 34 | > | cp iso2klems.pl $(INSTDIR)/iso2klems | 
| 35 | > | chmod 755 $(INSTDIR)/optics2rad $(INSTDIR)/iso2klems | 
| 36 |  | cd $(LIBDIR) && rm -f $(LIBFILES) | 
| 37 |  | cp $(LIBFILES) $(LIBDIR) | 
| 38 |  |  | 
| 39 |  | clean: | 
| 40 | < | set nonomatch; rm -f $(PROGS) *.o core | 
| 40 | > | set nonomatch; rm -f $(PROGS) *.o | 
| 41 |  |  | 
| 42 |  | ies2rad:        ies2rad.o | 
| 43 |  | $(CC) $(CFLAGS) -o ies2rad ies2rad.o -lrtrad $(MLIB) | 
| 76 |  | $(CC) $(CFLAGS) -o 3ds2mgf 3ds2mgf.o rayopt3ds.o vect3ds.o \ | 
| 77 |  | -lmgf -lrtrad $(MLIB) | 
| 78 |  |  | 
| 79 | < | pabopto2bsdf:   pabopto2bsdf.o bsdfrep.o bsdfrbf.o bsdfmesh.o | 
| 80 | < | $(CC) $(CFLAGS) -o pabopto2bsdf pabopto2bsdf.o bsdfrep.o \ | 
| 81 | < | bsdfrbf.o bsdfmesh.o -lrtrad $(MLIB) | 
| 79 | > | pabopto2xyz:    pabopto2xyz.o | 
| 80 | > | $(CXX) $(CXXFLAGS) -o pabopto2xyz pabopto2xyz.o \ | 
| 81 | > | -lrtrad $(MLIB) | 
| 82 |  |  | 
| 83 | < | pabopto2rad:    pabopto2rad.o bsdfrep.o bsdfrbf.o bsdfmesh.o | 
| 83 | > | pabopto2bsdf:   pabopto2bsdf.o bsdfrep.o bsdfrbf.o bsdfmesh.o bsdftrans.o | 
| 84 | > | $(CXX) $(CXXFLAGS) -o pabopto2bsdf pabopto2bsdf.o bsdfrep.o \ | 
| 85 | > | bsdfrbf.o bsdfmesh.o bsdftrans.o -lrtrad $(MLIB) | 
| 86 | > |  | 
| 87 | > | pabopto2rad:    pabopto2rad.o bsdfrep.o bsdfrbf.o | 
| 88 |  | $(CC) $(CFLAGS) -o pabopto2rad pabopto2rad.o bsdfrep.o \ | 
| 89 | < | bsdfrbf.o bsdfmesh.o -lrtrad $(MLIB) | 
| 89 | > | bsdfrbf.o -lrtrad $(MLIB) | 
| 90 |  |  | 
| 91 |  | pabopto2rad.o:  pabopto2bsdf.c bsdfrep.h | 
| 92 |  | $(CC) $(CFLAGS) -c -DTEST_MAIN -o pabopto2rad.o pabopto2bsdf.c | 
| 95 |  | $(CC) $(CFLAGS) -o bsdf2rad bsdf2rad.o bsdfrep.o bsdfinterp.o \ | 
| 96 |  | -lrtrad $(MLIB) | 
| 97 |  |  | 
| 98 | + | bsdf2rado:      bsdf2rado.o bsdfrep.o bsdfinterp.o | 
| 99 | + | $(CC) $(CFLAGS) -o bsdf2rado bsdf2rado.o bsdfrep.o bsdfinterp.o \ | 
| 100 | + | -lrtrad $(MLIB) | 
| 101 | + |  | 
| 102 |  | bsdfquery:      bsdfquery.o bsdfrep.o bsdfinterp.o | 
| 103 |  | $(CC) $(CFLAGS) -o bsdfquery bsdfquery.o bsdfrep.o bsdfinterp.o \ | 
| 104 |  | -lrtrad $(MLIB) | 
| 114 |  | pkgBSDF:        pkgBSDF.o | 
| 115 |  | $(CC) $(CFLAGS) -o pkgBSDF pkgBSDF.o -lrtrad $(MLIB) | 
| 116 |  |  | 
| 117 | + | checkBSDF:      checkBSDF.o | 
| 118 | + | $(CC) $(CFLAGS) -o checkBSDF checkBSDF.o -lrtrad $(MLIB) | 
| 119 | + |  | 
| 120 |  | epw2wea:        epw2wea.o | 
| 121 |  | $(CC) $(CFLAGS) -o epw2wea epw2wea.o | 
| 122 |  |  | 
| 123 | + | robjutil:       robjutil.o | 
| 124 | + | $(CC) $(CFLAGS) -o robjutil robjutil.o \ | 
| 125 | + | -lwfobj -lrtrad $(MLIB) | 
| 126 | + |  | 
| 127 |  | mgf2rad.o:      mgf2rad.c ../common/mgf_parser.h ../common/tmesh.h \ | 
| 128 |  | ../common/color.h | 
| 129 |  | $(CC) $(CFLAGS) -c mgf2rad.c | 
| 155 |  |  | 
| 156 |  | 3ds2mgf.o rayopt3ds.o vect3ds.o:        vect3ds.h | 
| 157 |  |  | 
| 158 | < | pkgBSDF.o:      ../common/bsdf.h ../common/fvect.h ../common/ccolor.h \ | 
| 159 | < | ../common/paths.h | 
| 158 | > | checkBSDF.o pkgBSDF.o:  ../common/bsdf.h ../common/fvect.h \ | 
| 159 | > | ../common/ccolor.h ../common/paths.h | 
| 160 |  |  | 
| 161 | < | bsdf2ttree.o bsdfinterp.o bsdfmesh.o bsdfrbf.o bsdfrep.o bsdf2rad.o \ | 
| 161 | > | bsdf2ttree.o bsdfinterp.o bsdfmesh.o bsdfrbf.o bsdfrep.o bsdf2rad.o bsdftrans.o \ | 
| 162 |  | pabopto2bsdf.o: bsdfrep.h ../common/bsdf.h ../common/fvect.h ../common/ccolor.h | 
| 163 |  |  | 
| 164 |  | bsdf2ttree.o pabopto2bsdf.o:    ../common/platform.h | 
| 165 |  |  | 
| 166 |  | bsdfrep.o:      ../common/resolu.h ../common/rtio.h | 
| 167 |  |  | 
| 168 | + | pabopto2bsdf.o: ../common/resolu.h | 
| 169 | + |  | 
| 170 |  | bsdf2rad.o bsdf2ttree.o:        ../common/rtprocess.h | 
| 171 |  |  | 
| 172 |  | bsdf2klems.o bsdf2ttree.o mgf2meta.o:   ../common/random.h | 
| 173 | + |  | 
| 174 | + | bsdftrans.o:    transportSimplex.h | 
| 175 | + |  | 
| 176 | + | bsdfquery.o:    ../common/rtmath.h ../common/rtio.h bsdfrep.h | 
| 177 | + |  | 
| 178 | + | checkBSDF.o:    ../common/rtio.h ../common/bsdf_m.h ../common/bsdf_t.h | 
| 179 | + |  | 
| 180 | + | robjutil.o:     ../common/objutil.h |