--- ray/src/cv/Rmakefile 2014/03/08 01:05:00 2.46 +++ ray/src/cv/Rmakefile 2014/03/26 02:52:31 2.47 @@ -1,4 +1,4 @@ -# RCSid $Id: Rmakefile,v 2.46 2014/03/08 01:05:00 greg Exp $ +# RCSid $Id: Rmakefile,v 2.47 2014/03/26 02:52:31 greg Exp $ # # Makefile for conversion programs # @@ -8,9 +8,11 @@ OPT = -O MACH = -DBSD CFLAGS = -I../common -L../lib $(OPT) $(MACH) +CXXFLAGS = $(CFLAGS) METACFLAGS = -I../meta CC = cc +CXX = g++ MLIB = -lm @@ -73,9 +75,9 @@ mgf2inv: mgf2inv.o $(CC) $(CFLAGS) -o 3ds2mgf 3ds2mgf.o rayopt3ds.o vect3ds.o \ -lmgf -lrtrad $(MLIB) -pabopto2bsdf: pabopto2bsdf.o bsdfrep.o bsdfrbf.o bsdfmesh.o - $(CC) $(CFLAGS) -o pabopto2bsdf pabopto2bsdf.o bsdfrep.o \ -bsdfrbf.o bsdfmesh.o -lrtrad $(MLIB) +pabopto2bsdf: pabopto2bsdf.o bsdfrep.o bsdfrbf.o bsdfmesh.o bsdftrans.o + $(CXX) $(CXXFLAGS) -o pabopto2bsdf pabopto2bsdf.o bsdfrep.o \ +bsdfrbf.o bsdfmesh.o bsdftrans.o -lrtrad $(MLIB) pabopto2rad: pabopto2rad.o bsdfrep.o bsdfrbf.o bsdfmesh.o $(CC) $(CFLAGS) -o pabopto2rad pabopto2rad.o bsdfrep.o \ @@ -140,7 +142,7 @@ mgf2inv.o: ../common/mgf_parser.h ../common/ccolor.h pkgBSDF.o: ../common/bsdf.h ../common/fvect.h ../common/ccolor.h \ ../common/paths.h -bsdf2ttree.o bsdfinterp.o bsdfmesh.o bsdfrbf.o bsdfrep.o bsdf2rad.o \ +bsdf2ttree.o bsdfinterp.o bsdfmesh.o bsdfrbf.o bsdfrep.o bsdf2rad.o bsdftrans.o \ pabopto2bsdf.o: bsdfrep.h ../common/bsdf.h ../common/fvect.h ../common/ccolor.h bsdf2ttree.o pabopto2bsdf.o: ../common/platform.h @@ -152,3 +154,5 @@ pabopto2bsdf.o: ../common/resolu.h bsdf2rad.o bsdf2ttree.o: ../common/rtprocess.h bsdf2klems.o bsdf2ttree.o mgf2meta.o: ../common/random.h + +bsdftrans.o: transportSimplex.h