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.6 by greg, Fri Jul 10 14:55:45 1992 UTC vs.
Revision 2.13 by greg, Fri Feb 12 10:38:36 1993 UTC

# Line 43 | Line 43 | DLIBS = -lX11
43   # Standard object files:
44   #
45  
46 < RTOBJS = rtmain.o rtrace.o $(ROBJS) Version.o
46 > RTOBJS = rtmain.o rtrace.o duphead.o persist.o preload.o $(ROBJS) Version.o
47   RTSRC = rmain.c rtrace.c $(RSRC) Version.c
48  
49 < RPOBJS = rpmain.o rpict.o $(ROBJS) Version.o
49 > RPOBJS = rpmain.o rpict.o duphead.o persist.o preload.o $(ROBJS) Version.o
50   RPSRC = rmain.c rpict.c $(RSRC) Version.c
51  
52 < RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS) $(ROBJS) Version.o
53 < RVSRC = rmain.c rview.c rv2.c rv3.c $(DSRC) $(RSRC) Version.c
52 > RVOBJS = rvmain.o rview.o rv2.o rv3.o freeobjmem.o $(DOBJS) $(ROBJS) Version.o
53 > RVSRC = rmain.c rview.c rv2.c rv3.c freeobjmem.c $(DSRC) $(RSRC) Version.c
54  
55   ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
56          $(MODOBJS) $(SUPPOBJS)
57   RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \
58          $(MODSRC) $(SUPPSRC)
59  
60 < RAYOBJS = initotypes.o raytrace.o ambient.o ambcomp.o
61 < RAYSRC = initotypes.c raytrace.c ambient.c ambcomp.c
60 > RAYOBJS = initotypes.o raytrace.o ambient.o ambcomp.o ambio.o
61 > RAYSRC = initotypes.c raytrace.c ambient.c ambcomp.c ambio.c
62  
63   SURFOBJS = source.o sphere.o srcsupp.o srcsamp.o virtuals.o o_face.o \
64          o_cone.o o_instance.o
# Line 67 | Line 67 | SURFSRC = sphere.c source.c srcsupp.c virtuals.c o_fac
67  
68   MATOBJS = aniso.o normal.o dielectric.o m_clip.o glass.o m_brdf.o \
69          m_mirror.o m_direct.o
70 < MATSRC = normal.c dielectric.c m_clip.c glass.c m_brdf.c m_mirror.c \
71 <        m_direct.c
70 > MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.c m_brdf.c \
71 >        m_mirror.c m_direct.c
72  
73   MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
74   MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c
# Line 122 | Line 122 | $(DESTDIR)/rpict:      $(RPOBJS)
122   $(DESTDIR)/rview:       $(RVOBJS)
123          $(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) $(LIBS)
124  
125 < $(DESTDIR)/lookamb:     lookamb.o
126 <        $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o
125 > $(DESTDIR)/lookamb:     lookamb.o ambio.o
126 >        $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o -lrt
127  
128   $(DEVDIR)/sun:  sundev.o devmain.o colortab.o editline.o
129          $(CC) $(CFLAGS) -s -o $(DEVDIR)/sun devmain.o sundev.o colortab.o \
# Line 186 | Line 186 | x10.o: x10.c
186   aed.o:  aed.c
187          $(CC) $(CFLAGS) -Daed_init=dinit -c aed.c
188  
189 – ambient.o:      ambient.c
190 –        $(CC) $(CFLAGS) -DAMBFLUSH=16 -c ambient.c
191 –
189   calexpr.o:      calexpr.c ../common/calcomp.h
190          $(CC) $(CFLAGS) -DVARIABLE -DFUNCTION -DINCHAN -DRCONST -c calexpr.c
191  
# Line 213 | Line 210 | Version.c:     VERSION $(RSRC) $(HEADERS)
210   # Include dependencies:
211   #
212  
213 < aed.o colortab.o data.o devcomm.o \
213 > aed.o ambio.o colortab.o data.o devcomm.o \
214   devmain.o lookamb.o rview.o sundev.o x10.o x11.o:       ../common/color.h
215  
216   o_cone.o srcsupp.o:     ../common/cone.h
# Line 231 | Line 228 | rtrace.o rvmain.o rv2.o rv3.o source.o:        ../common/octr
228   o_instance.o:   ../common/instance.h ../common/octree.h
229  
230   ambient.o aniso.o dielectric.o func.o initotypes.o m_brdf.o \
231 < normal.o o_cone.o text.o raytrace.o rtrace.o \
231 > normal.o o_cone.o text.o raytrace.o rtrace.o freeobjmem.o \
232   rv2.o source.o srcsupp.o virtuals.o sphere.o:   ../common/otypes.h
233  
234   ambient.o ambcomp.o aniso.o normal.o rpict.o \
# Line 241 | Line 238 | ambient.o ambcomp.o aniso.o dielectric.o func.o glass.
238   m_brdf.o mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
239   p_data.o p_func.o text.o raytrace.o rpmain.o rtmain.o rvmain.o rpict.o \
240   rtrace.o rview.o rv2.o rv3.o source.o srcsamp.o srcsupp.o virtuals.o \
241 < sphere.o t_data.o t_func.o:     ray.h ../common/standard.h \
241 > sphere.o t_data.o t_func.o persist.o duphead.o: ray.h ../common/standard.h \
242   ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
243  
244   rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h
# Line 249 | Line 246 | rv2.o rv3.o rview.o:   rpaint.h driver.h ../common/view.
246   m_direct.o m_mirror.o \
247   source.o srcsamp.o srcsupp.o virtuals.o:        source.h
248  
249 < cone.o data.o devcomm.o initotypes.o \
249 > cone.o data.o devcomm.o freeobjmem.o initotypes.o \
250   octree.o:       ../common/standard.h ../common/mat4.h ../common/fvect.h
251  
252   initotypes.o raytrace.o:        otspecial.h
# Line 264 | Line 261 | x11.o x11twind.o: x11twind.h
261  
262   x11.o:  x11icon.h
263  
264 < ambient.o ambcomp.o lookamb.o:  ambient.h
264 > ambient.o ambcomp.o ambio.o lookamb.o:  ambient.h
265  
266   data.o rmain.o rpict.o rtrace.o rv2.o:  ../common/resolu.h
267  
268   aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o p_data.o \
269   p_func.o t_data.o t_func.o:     func.h
270  
271 + freeobjmem.o:   ../common/object.h
272 +
273   devcomm.o:      ../common/vfork.h
274 +
275 + rtmain.o rpmain.o rvmain.o persist.o duphead.o rpict.o: ../common/paths.h

Diff Legend

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