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

Comparing ray/src/ot/Rmakefile (file contents):
Revision 2.12 by greg, Fri Jun 27 06:53:22 2003 UTC vs.
Revision 2.19 by greg, Thu Apr 21 00:40:35 2016 UTC

# Line 5 | Line 5
5   #     The compile define "STRICT" enforces strict intersection calculations
6   #  so that no cube which does not intersect an object contains that object.
7   #  Otherwise, a somewhat faster more lax approach is taken by certain routines.
8 + #  This is set to "1" by default, so -DSTRICT=0 now turns it off.
9   #
10  
11   OPT = -O
12   MACH = -DBSD
13 < CFLAGS = -DSTRICT -I../common -L../lib $(OPT) $(MACH)
13 > CFLAGS = -I../common -L../lib $(OPT) $(MACH)
14   CC = cc
15   MLIB = -lm
16  
# Line 25 | Line 26 | oconv: oconv.o sphere.o writeoct.o o_face.o \
26   o_cone.o o_instance.o bbox.o initotypes.o
27          $(CC) $(CFLAGS) -o oconv oconv.o writeoct.o sphere.o o_face.o \
28   o_cone.o o_instance.o bbox.o \
29 < initotypes.o -lrt $(MLIB)
29 > initotypes.o -lrtrad $(MLIB)
30  
31   getbbox:        getbbox.o readobj2.o bbox.o init2otypes.o
32          $(CC) $(CFLAGS) -o getbbox getbbox.o readobj2.o \
33 < bbox.o init2otypes.o -lrt $(MLIB)
33 > bbox.o init2otypes.o -lrtrad $(MLIB)
34  
35   obj2mesh:       obj2mesh.o cvmesh.o wfconv.o o_face.o writemesh.o
36          $(CC) $(CFLAGS) -o obj2mesh obj2mesh.o cvmesh.o wfconv.o \
37 < o_face.o writemesh.o -lrt $(MLIB)
37 > o_face.o writemesh.o -lrtrad $(MLIB)
38  
39   install:        $(PROGS)
40          cp $(PROGS) $(INSTDIR)
41  
42   clean:
43 <        set nonomatch; rm -f $(PROGS) *.o core
43 >        set nonomatch; rm -f $(PROGS) *.o
44  
45   bbox.o initotypes.o o_cone.o o_face.o \
46   o_instance.o oconv.o sphere.o \
# Line 56 | Line 57 | sphere.o writeoct.o:   ../common/object.h
57  
58   bbox.o initotypes.o oconv.o obj2mesh.o sphere.o:        ../common/otypes.h
59  
60 + bbox.o getbbox.o initotypes.o oconv.o readobj2.o writeoct.o: oconv.h
61 +
62   oconv.o:        ../common/paths.h
63  
64   bbox.o o_cone.o:        ../common/cone.h
# Line 74 | Line 77 | initotypes.o init2otypes.o:    ../common/otypes.h
77   cvmesh.o obj2mesh.o wfconv.o:   cvmesh.h \
78   ../common/octree.h ../common/object.h ../common/mesh.h
79  
80 < cvmesh.o:       ../common/otypes.h ../common/face.h
80 > cvmesh.o:       ../common/otypes.h ../common/face.h ../common/tmesh.h

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines