[ViewVC] Diff of: Development/ray/src/cv/Rmakefile

Comparing ray/src/cv/Rmakefile (file contents):
Revision 2.48 by greg, Wed Mar 26 22:29:08 2014 UTC vs.
Revision 2.51 by greg, Wed Jul 27 18:05:53 2016 UTC

#	Line 22 \| Line 22 \| 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
25	>	pabopto2xyz pabopto2bsdf bsdf2ttree bsdf2klems pkgBSDF epw2wea
26
27		LIBFILES = source.cal tilt.cal lamp.tab window.cal
28
#	Line 36 \| Line 36 \| install: $(PROGS) $(LIBFILES) optics2rad.csh
36		cp $(LIBFILES) $(LIBDIR)
37
38		clean:
39	<	set nonomatch; rm -f $(PROGS) *.o core
39	>	set nonomatch; rm -f $(PROGS) *.o
40
41		ies2rad: ies2rad.o
42		$(CC) $(CFLAGS) -o ies2rad ies2rad.o -lrtrad $(MLIB)
#	Line 75 \| Line 75 \| mgf2inv: mgf2inv.o
75		$(CC) $(CFLAGS) -o 3ds2mgf 3ds2mgf.o rayopt3ds.o vect3ds.o \
76		-lmgf -lrtrad $(MLIB)
77
78	+	pabopto2xyz: pabopto2xyz.o
79	+	$(CXX) $(CXXFLAGS) -o pabopto2xyz pabopto2xyz.o \
80	+	-lrtrad $(MLIB)
81	+
82		pabopto2bsdf: pabopto2bsdf.o bsdfrep.o bsdfrbf.o bsdfmesh.o bsdftrans.o
83		$(CXX) $(CXXFLAGS) -o pabopto2bsdf pabopto2bsdf.o bsdfrep.o \
84		bsdfrbf.o bsdfmesh.o bsdftrans.o -lrtrad $(MLIB)
85
86	<	pabopto2rad: pabopto2rad.o bsdfrep.o bsdfrbf.o bsdfmesh.o
86	>	pabopto2rad: pabopto2rad.o bsdfrep.o bsdfrbf.o
87		$(CC) $(CFLAGS) -o pabopto2rad pabopto2rad.o bsdfrep.o \
88	<	bsdfrbf.o bsdfmesh.o -lrtrad $(MLIB)
88	>	bsdfrbf.o -lrtrad $(MLIB)
89
90		pabopto2rad.o: pabopto2bsdf.c bsdfrep.h
91		$(CC) $(CFLAGS) -c -DTEST_MAIN -o pabopto2rad.o pabopto2bsdf.c

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines