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

Comparing ray/src/cv/Rmakefile (file contents):
Revision 2.47 by greg, Wed Mar 26 02:52:31 2014 UTC vs.
Revision 2.54 by greg, Thu Apr 13 00:14:36 2017 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 21 | 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 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
# Line 156 | Line 160 | bsdf2rad.o bsdf2ttree.o:       ../common/rtprocess.h
160   bsdf2klems.o bsdf2ttree.o mgf2meta.o:   ../common/random.h
161  
162   bsdftrans.o:    transportSimplex.h
163 +
164 + bsdfquery.o:    ../common/rtmath.h ../common/rtio.h bsdfrep.h

Diff Legend

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