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

Comparing ray/src/cv/Rmakefile (file contents):
Revision 2.47 by greg, Wed Mar 26 02:52:31 2014 UTC vs.
Revision 2.50 by greg, Sat Apr 26 15:59:38 2014 UTC

#	Line 12 \| Line 12 \| CXXFLAGS = $(CFLAGS)
12		METACFLAGS = -I../meta
13
14		CC = cc
15	<	CXX = g++
15	>	CXX = c++
16
17		MLIB = -lm
18
#	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 79 \| Line 79 \| pabopto2bsdf: pabopto2bsdf.o bsdfrep.o bsdfrbf.o bsdfm
79		$(CXX) $(CXXFLAGS) -o pabopto2bsdf pabopto2bsdf.o bsdfrep.o \
80		bsdfrbf.o bsdfmesh.o bsdftrans.o -lrtrad $(MLIB)
81
82	<	pabopto2rad: pabopto2rad.o bsdfrep.o bsdfrbf.o bsdfmesh.o
82	>	pabopto2rad: pabopto2rad.o bsdfrep.o bsdfrbf.o
83		$(CC) $(CFLAGS) -o pabopto2rad pabopto2rad.o bsdfrep.o \
84	<	bsdfrbf.o bsdfmesh.o -lrtrad $(MLIB)
84	>	bsdfrbf.o -lrtrad $(MLIB)
85
86		pabopto2rad.o: pabopto2bsdf.c bsdfrep.h
87		$(CC) $(CFLAGS) -c -DTEST_MAIN -o pabopto2rad.o pabopto2bsdf.c

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