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.55 by greg, Thu Jun 7 15:39:36 2018 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 19 | Line 21 | INSTDIR = /usr/local/bin
21   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
24 > mgf2rad rad2mgf mgf2meta mgfilt mgf2inv 3ds2mgf bsdfquery \
25 > pabopto2xyz pabopto2bsdf bsdf2ttree bsdf2klems pkgBSDF epw2wea bsdf2rad
26  
27 < LIBFILES = source.cal tilt.cal lamp.tab window.cal
27 > LIBFILES = source.cal tilt.cal lamp.tab window.cal bsdf2rad.cal
28  
29   all:    $(PROGS)
30  
# Line 34 | 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 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 > pabopto2xyz:    pabopto2xyz.o
79 >        $(CXX) $(CXXFLAGS) -o pabopto2xyz pabopto2xyz.o \
80 > -lrtrad $(MLIB)
81  
82 < pabopto2rad:    pabopto2rad.o bsdfrep.o bsdfrbf.o bsdfmesh.o
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
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
# Line 88 | Line 94 | bsdf2rad:      bsdf2rad.o bsdfrep.o bsdfinterp.o
94          $(CC) $(CFLAGS) -o bsdf2rad bsdf2rad.o bsdfrep.o bsdfinterp.o \
95   -lrtrad $(MLIB)
96  
97 + bsdf2rado:      bsdf2rado.o bsdfrep.o bsdfinterp.o
98 +        $(CC) $(CFLAGS) -o bsdf2rado bsdf2rado.o bsdfrep.o bsdfinterp.o \
99 + -lrtrad $(MLIB)
100 +
101 + bsdfquery:      bsdfquery.o bsdfrep.o bsdfinterp.o
102 +        $(CC) $(CFLAGS) -o bsdfquery bsdfquery.o bsdfrep.o bsdfinterp.o \
103 + -lrtrad $(MLIB)
104 +
105   bsdf2ttree:     bsdf2ttree.o bsdfrep.o bsdfinterp.o
106          $(CC) $(CFLAGS) -o bsdf2ttree bsdf2ttree.o bsdfrep.o bsdfinterp.o \
107   -lrtrad $(MLIB)
# Line 136 | Line 150 | mgf2inv.o:     ../common/mgf_parser.h ../common/ccolor.h
150   pkgBSDF.o:      ../common/bsdf.h ../common/fvect.h ../common/ccolor.h \
151   ../common/paths.h
152  
153 < bsdf2ttree.o bsdfinterp.o bsdfmesh.o bsdfrbf.o bsdfrep.o bsdf2rad.o \
153 > bsdf2ttree.o bsdfinterp.o bsdfmesh.o bsdfrbf.o bsdfrep.o bsdf2rad.o bsdftrans.o \
154   pabopto2bsdf.o: bsdfrep.h ../common/bsdf.h ../common/fvect.h ../common/ccolor.h
155  
156   bsdf2ttree.o pabopto2bsdf.o:    ../common/platform.h
157  
158   bsdfrep.o:      ../common/resolu.h ../common/rtio.h
159 +
160 + pabopto2bsdf.o: ../common/resolu.h
161 +
162 + bsdf2rad.o bsdf2ttree.o:        ../common/rtprocess.h
163 +
164 + bsdf2klems.o bsdf2ttree.o mgf2meta.o:   ../common/random.h
165 +
166 + bsdftrans.o:    transportSimplex.h
167 +
168 + bsdfquery.o:    ../common/rtmath.h ../common/rtio.h bsdfrep.h

Diff Legend

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