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.57 by greg, Thu Aug 21 07:05:58 2008 UTC vs.
Revision 2.62 by greg, Fri Feb 18 00:40:25 2011 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 73 | Line 73 | SURFSRC = sphere.c source.c srcobstr.c srcsupp.c srcsa
73          o_face.c 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 m_alias.o
76 >        m_mirror.o m_direct.o m_mist.o fprism.o m_alias.o m_bsdf.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 m_alias.c
78 >        m_mirror.c m_direct.c m_mist.c fprism.c m_alias.c m_bsdf.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 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)
# Line 125 | Line 125 | $(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 182 | Line 184 | ambient.o ambcomp.o aniso.o normal.o raycalls.o raytra
184   rvmain.o rtmain.o rpmain.o persist.o source.o rv3.o \
185   srcsamp.o virtuals.o:   ../common/random.h
186  
187 < ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o \
187 > ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o m_bsdf.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 \
# Line 241 | Line 243 | m_alias.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mi
243   mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
244   o_mesh.o p_data.o p_func.o source.o sphere.o t_data.o t_func.o \
245   srcobstr.o text.o:              rtotypes.h
246 +
247 + m_bsdf.o:       ambient.h source.h func.h \
248 + ../common/calcomp.h ../common/paths.h ../common/bsdf.h ../common/random.h

Diff Legend

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