--- ray/src/cv/Rmakefile 2014/03/26 02:52:31 2.47 +++ ray/src/cv/Rmakefile 2014/03/27 03:49:14 2.49 @@ -1,4 +1,4 @@ -# RCSid $Id: Rmakefile,v 2.47 2014/03/26 02:52:31 greg Exp $ +# RCSid $Id: Rmakefile,v 2.49 2014/03/27 03:49:14 greg Exp $ # # Makefile for conversion programs # @@ -12,7 +12,7 @@ CXXFLAGS = $(CFLAGS) METACFLAGS = -I../meta CC = cc -CXX = g++ +CXX = c++ MLIB = -lm @@ -79,9 +79,9 @@ pabopto2bsdf: pabopto2bsdf.o bsdfrep.o bsdfrbf.o bsdfm $(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 +pabopto2rad: pabopto2rad.o bsdfrep.o bsdfrbf.o $(CC) $(CFLAGS) -o pabopto2rad pabopto2rad.o bsdfrep.o \ -bsdfrbf.o bsdfmesh.o -lrtrad $(MLIB) +bsdfrbf.o -lrtrad $(MLIB) pabopto2rad.o: pabopto2bsdf.c bsdfrep.h $(CC) $(CFLAGS) -c -DTEST_MAIN -o pabopto2rad.o pabopto2bsdf.c