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.55 by greg, Mon Oct 8 18:07:57 2007 UTC vs.
Revision 2.61 by greg, Sun Sep 26 15:51:15 2010 UTC

# 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  
132   $(RCLIB):       $(RLOBJS)
133 +        rm -f $(RCLIB)
134          ar rc $(RCLIB) $(RLOBJS)
135          -ranlib $(RCLIB)
136  
# Line 184 | Line 187 | srcsamp.o virtuals.o:  ../common/random.h
187   ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o \
188   m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o o_mesh.o \
189   mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \
190 < raycalls.o raypcalls.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
190 > raycalls.o raypcalls.o rayfifo.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
191   source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \
192   text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o: ray.h \
193   ../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \
194 < ../common/rterror.h ../common/octree.h ../common/tifftypes.h \
194 > ../common/rterror.h ../common/octree.h \
195   ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
196  
197   rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h ../common/resolu.h
# Line 199 | Line 202 | srcobstr.o srcsamp.o srcsupp.o virtuals.o:     source.h
202  
203   cone.o data.o devcomm.o initotypes.o fprism.o preload.o \
204   duphead.o octree.o:     ../common/standard.h ../common/rtmisc.h \
205 < ../common/rtio.h ../common/rtmath.h ../common/tifftypes.h \
205 > ../common/rtio.h ../common/rtmath.h \
206   ../common/rterror.h ../common/mat4.h ../common/fvect.h
207  
208   ambio.o:        ../common/fvect.h

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines