ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/cv/Rmakefile
(Generate patch)

Comparing ray/src/cv/Rmakefile (file contents):
Revision 2.42 by greg, Fri Nov 8 23:32:54 2013 UTC vs.
Revision 2.49 by greg, Thu Mar 27 03:49:14 2014 UTC

# Line 8 | Line 8 | OPT = -O
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  
# Line 73 | Line 75 | mgf2inv:       mgf2inv.o
75          $(CC) $(CFLAGS) -o 3ds2mgf 3ds2mgf.o rayopt3ds.o vect3ds.o \
76   -lmgf -lrtrad $(MLIB)
77  
78 < pabopto2bsdf:   pabopto2bsdf.o bsdfrep.o bsdfrbf.o bsdfmesh.o
79 <        $(CC) $(CFLAGS) -o pabopto2bsdf pabopto2bsdf.o bsdfrep.o \
80 < bsdfrbf.o bsdfmesh.o -lrtrad $(MLIB)
78 > pabopto2bsdf:   pabopto2bsdf.o bsdfrep.o bsdfrbf.o bsdfmesh.o bsdftrans.o
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
# Line 88 | Line 90 | bsdf2rad:      bsdf2rad.o bsdfrep.o bsdfinterp.o
90          $(CC) $(CFLAGS) -o bsdf2rad bsdf2rad.o bsdfrep.o bsdfinterp.o \
91   -lrtrad $(MLIB)
92  
93 + bsdfquery:      bsdfquery.o bsdfrep.o bsdfinterp.o
94 +        $(CC) $(CFLAGS) -o bsdfquery bsdfquery.o bsdfrep.o bsdfinterp.o \
95 + -lrtrad $(MLIB)
96 +
97   bsdf2ttree:     bsdf2ttree.o bsdfrep.o bsdfinterp.o
98          $(CC) $(CFLAGS) -o bsdf2ttree bsdf2ttree.o bsdfrep.o bsdfinterp.o \
99   -lrtrad $(MLIB)
# Line 136 | Line 142 | mgf2inv.o:     ../common/mgf_parser.h ../common/ccolor.h
142   pkgBSDF.o:      ../common/bsdf.h ../common/fvect.h ../common/ccolor.h \
143   ../common/paths.h
144  
145 < bsdf2ttree.o bsdfinterp.o bsdfmesh.o bsdfrbf.o bsdfrep.o bsdf2rad.o \
145 > bsdf2ttree.o bsdfinterp.o bsdfmesh.o bsdfrbf.o bsdfrep.o bsdf2rad.o bsdftrans.o \
146   pabopto2bsdf.o: bsdfrep.h ../common/bsdf.h ../common/fvect.h ../common/ccolor.h
147  
148   bsdf2ttree.o pabopto2bsdf.o:    ../common/platform.h
149  
150   bsdfrep.o:      ../common/resolu.h ../common/rtio.h
151 +
152 + pabopto2bsdf.o: ../common/resolu.h
153 +
154 + bsdf2rad.o bsdf2ttree.o:        ../common/rtprocess.h
155 +
156 + bsdf2klems.o bsdf2ttree.o mgf2meta.o:   ../common/random.h
157 +
158 + bsdftrans.o:    transportSimplex.h

Diff Legend

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