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

Comparing ray/src/rt/Rmakefile (file contents):
Revision 2.33 by greg, Sat Feb 22 02:07:28 2003 UTC vs.
Revision 2.37 by greg, Fri Jun 27 06:53:22 2003 UTC

# Line 29 | Line 29 | LIBDIR = /usr/local/lib/ray
29   # Library routines:
30   #
31   RLIB = ../lib/libradiance.a
32 + RCLIB = libraycalls.a
33   LIBS = -lrt $(MLIB)
34  
35   #
# Line 67 | Line 68 | RAYSRC = ambcomp.c ambient.c ambio.c freeobjmem.c init
68          preload.c raytrace.c renderopts.c
69  
70   SURFOBJS = source.o sphere.o srcsupp.o srcsamp.o virtuals.o o_face.o \
71 <        o_cone.o o_instance.o
71 >        o_cone.o o_instance.o o_mesh.o
72   SURFSRC = sphere.c source.c srcsupp.c virtuals.c o_face.c \
73 <        srcsamp.c o_cone.c o_instance.c
73 >        srcsamp.c o_cone.c o_instance.c o_mesh.c
74  
75   MATOBJS = aniso.o normal.o dielectric.o m_clip.o glass.o m_brdf.o \
76 <        m_mirror.o m_direct.o m_mist.o fprism.o
76 >        m_mirror.o m_direct.o m_mist.o fprism.o m_alias.o
77   MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.c m_brdf.c \
78 <        m_mirror.c m_direct.c m_mist.c fprism.c
78 >        m_mirror.c m_direct.c m_mist.c fprism.c m_alias.c
79  
80   MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
81   MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c
# Line 90 | Line 91 | HEADERS = ambient.h ray.h data.h otspecial.h source.h
91  
92   PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview $(DESTDIR)/lookamb
93  
94 < all:    $(PROGS) $(SPECIAL) $(RLOBJS)
94 > all:    $(PROGS) $(RCLIB) $(SPECIAL)
95  
96   install:        all rayinit.cal
97          $(INSTALL) $(PROGS) $(INSTDIR)
98 <        cp $(RLOBJS) ../lib
98 >        mv $(RCLIB) ../lib
99          rm -f $(LIBDIR)/rayinit.cal
100          cp rayinit.cal $(LIBDIR)
101  
# Line 132 | Line 133 | $(RLIB):       $(ROBJS) Version.o
133          ar rc $(RLIB) $(ROBJS) Version.o
134          -ranlib $(RLIB)
135  
136 + $(RCLIB):       $(RLOBJS)
137 +        ar rc $(RCLIB) $(RLOBJS)
138 +        -ranlib $(RCLIB)
139 +
140   #
141   # Special compiles:
142   #
# Line 187 | Line 192 | freeobjmem.o o_face.o srcsupp.o:       ../common/face.h
192   ambient.o raytrace.o rpmain.o rtmain.o \
193   rtrace.o rvmain.o rv2.o rv3.o source.o: ../common/octree.h
194  
195 < o_instance.o:   ../common/instance.h ../common/octree.h
195 > o_instance.o:   ../common/instance.h
196  
197   ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o initotypes.o \
198   m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o preload.o \
# Line 199 | Line 204 | rtmain.o rpmain.o persist.o source.o rv3.o \
204   srcsamp.o virtuals.o:   ../common/random.h
205  
206   ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o \
207 < m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o \
207 > m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o o_mesh.o \
208   mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \
209   raycalls.o raypcalls.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
210   source.o sphere.o srcdraw.o srcsamp.o srcsupp.o t_data.o t_func.o text.o \
211 < rpmain.o rtmain.o rvmain.o virtuals.o:  ray.h \
212 < ../common/standard.h ../common/octree.h \
211 > rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o:        ray.h \
212 > ../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \
213 > ../common/rterror.h ../common/octree.h \
214   ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
215  
216   rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h ../common/resolu.h
# Line 213 | Line 219 | m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o
219   source.o srcdraw.o srcsamp.o srcsupp.o virtuals.o:      source.h
220  
221   cone.o data.o devcomm.o initotypes.o fprism.o preload.o \
222 < duphead.o octree.o:     ../common/standard.h ../common/mat4.h ../common/fvect.h
222 > duphead.o octree.o:     ../common/standard.h ../common/rtmisc.h \
223 > ../common/rtio.h ../common/rtmath.h \
224 > ../common/rterror.h ../common/mat4.h ../common/fvect.h
225  
226   ambio.o:        ../common/fvect.h
227  
# Line 235 | Line 243 | aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o
243   p_func.o t_data.o t_func.o:     func.h
244  
245   preload.o:      ../common/object.h ../common/face.h ../common/cone.h \
246 < ../common/instance.h ../common/color.h data.h
246 > ../common/instance.h ../common/mesh.h ../common/color.h data.h
247  
248   devcomm.o:      ../common/vfork.h
249  
# Line 244 | Line 252 | rtmain.o rpmain.o rvmain.o persist.o duphead.o rpict.o
252   freeobjmem.o raycalls.o text.o: ../common/font.h
253  
254   raypcalls.o:    ../common/selcall.h
255 +
256 + o_mesh.o:       ../common/mesh.h

Diff Legend

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