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

Comparing ray/src/rt/Rmakefile (file contents):
Revision 2.53 by greg, Fri Dec 16 04:03:42 2005 UTC vs.
Revision 2.60 by greg, Mon Aug 23 15:57:46 2010 UTC

# Line 30 | Line 30 | LIBDIR = /usr/local/lib/ray
30   #
31   RLIB = ../lib/libradiance.a
32   RCLIB = ../lib/libraycalls.a
33 < LIBS = -lrt $(MLIB)
33 > LIBS = -lrtrad $(MLIB)
34  
35   #
36   # Device drivers for rvu (see also devtable.c):
# Line 54 | Line 54 | RPSRC = rpmain.c rpict.c srcdraw.c duphead.c persist.c
54   RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS)
55   RVSRC = rvmain.c rview.c rv2.c rv3.c $(DSRC)
56  
57 < RLOBJS = raycalls.o raypcalls.o
58 < RLSRC = raycalls.c raypcalls.c
57 > RLOBJS = raycalls.o raypcalls.o rayfifo.o
58 > RLSRC = raycalls.c raypcalls.c rayfifo.c
59  
60   ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
61          $(MODOBJS) $(SUPPOBJS)
# Line 111 | Line 111 | lint:  $(RVSRC)
111   # Links:
112   #
113  
114 < $(DESTDIR)/rtrace:      $(RTOBJS) $(RLIB)
115 <        $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(RLIB) $(LIBS)
114 > $(DESTDIR)/rtrace:      $(RTOBJS) $(RCLIB) $(RLIB)
115 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(RCLIB) $(RLIB) $(LIBS)
116  
117   $(DESTDIR)/rpict:       $(RPOBJS) $(RLIB)
118          $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(RLIB) $(LIBS)
119  
120 < $(DESTDIR)/rvu: $(RVOBJS) $(RLIB)
121 <        $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RLIB) $(LIBS) $(DLIBS)
120 > $(DESTDIR)/rvu: $(RVOBJS) $(RCLIB) $(RLIB)
121 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RCLIB) \
122 > $(RLIB) $(LIBS) $(DLIBS)
123  
124   $(DESTDIR)/lookamb:     lookamb.o ambio.o
125          $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
126  
127   $(RLIB):        $(ROBJS) Version.o
128 +        rm -f $(RLIB)
129          ar rc $(RLIB) $(ROBJS) Version.o
130          -ranlib $(RLIB)
131  
# Line 184 | Line 186 | srcsamp.o virtuals.o:  ../common/random.h
186   ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o \
187   m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o o_mesh.o \
188   mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \
189 < raycalls.o raypcalls.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
189 > raycalls.o raypcalls.o rayfifo.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
190   source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \
191   text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o: ray.h \
192   ../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \
193 < ../common/rterror.h ../common/octree.h ../common/tifftypes.h \
193 > ../common/rterror.h ../common/octree.h \
194   ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
195  
196   rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h ../common/resolu.h
# Line 199 | Line 201 | srcobstr.o srcsamp.o srcsupp.o virtuals.o:     source.h
201  
202   cone.o data.o devcomm.o initotypes.o fprism.o preload.o \
203   duphead.o octree.o:     ../common/standard.h ../common/rtmisc.h \
204 < ../common/rtio.h ../common/rtmath.h ../common/tifftypes.h \
204 > ../common/rtio.h ../common/rtmath.h \
205   ../common/rterror.h ../common/mat4.h ../common/fvect.h
206  
207   ambio.o:        ../common/fvect.h
# Line 239 | Line 241 | aniso.o dielectric.o freeobjmem.o glass.o initotypes.o
241   m_alias.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o \
242   mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
243   o_mesh.o p_data.o p_func.o source.o sphere.o t_data.o t_func.o \
244 < text.o:         rtotypes.h
244 > srcobstr.o text.o:              rtotypes.h

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines