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.60 by greg, Mon Aug 23 15:57:46 2010 UTC vs.
Revision 2.69 by greg, Sun Jul 29 19:01:39 2012 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 + RCOBJS = rcmain.o rcontrib.o rc2.o rc3.o
58 + RCSRC = rcmain.c rcontrib.c rc2.c rc3.c
59 +
60   RLOBJS = raycalls.o raypcalls.o rayfifo.o
61   RLSRC = raycalls.c raypcalls.c rayfifo.c
62  
# Line 73 | Line 76 | SURFSRC = sphere.c source.c srcobstr.c srcsupp.c srcsa
76          o_face.c srcsamp.c o_cone.c o_instance.c o_mesh.c
77  
78   MATOBJS = aniso.o normal.o dielectric.o m_clip.o glass.o m_brdf.o \
79 <        m_mirror.o m_direct.o m_mist.o fprism.o m_alias.o
79 >        m_mirror.o m_direct.o m_mist.o fprism.o m_alias.o m_bsdf.o \
80 >        ashikhmin.o
81   MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.c m_brdf.c \
82 <        m_mirror.c m_direct.c m_mist.c fprism.c m_alias.c
82 >        m_mirror.c m_direct.c m_mist.c fprism.c m_alias.c m_bsdf.c \
83 >        ashikhmin.c
84  
85   MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
86   MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c
# Line 89 | Line 94 | HEADERS = ambient.h ray.h data.h otspecial.h source.h
94   # What this makefile produces:
95   #
96  
97 < PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/lookamb
97 > PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/rcontrib \
98 > $(DESTDIR)/lookamb
99  
100   all:    $(PROGS) $(RCLIB) $(SPECIAL)
101  
102   install:        all rayinit.cal
103          $(INSTALL) $(PROGS) $(INSTDIR)
104          cd $(INSTDIR) ; rm -f rview ; ln -s rvu rview
105 +        cd $(INSTDIR) ; rm -f rtcontrib ; ln -s rcontrib rtcontrib
106          rm -f $(LIBDIR)/rayinit.cal
107          cp rayinit.cal $(LIBDIR)
108  
# Line 121 | Line 128 | $(DESTDIR)/rvu:        $(RVOBJS) $(RCLIB) $(RLIB)
128          $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RCLIB) \
129   $(RLIB) $(LIBS) $(DLIBS)
130  
131 + $(DESTDIR)/rcontrib:      $(RCOBJS) $(RLIB)
132 +        $(CC) $(CFLAGS) -o $(DESTDIR)/rcontrib $(RCOBJS) $(RLIB) $(LIBS)
133 +
134   $(DESTDIR)/lookamb:     lookamb.o ambio.o
135          $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
136  
# Line 130 | Line 140 | $(RLIB):       $(ROBJS) Version.o
140          -ranlib $(RLIB)
141  
142   $(RCLIB):       $(RLOBJS)
143 +        rm -f $(RCLIB)
144          ar rc $(RCLIB) $(RLOBJS)
145          -ranlib $(RCLIB)
146  
# Line 180 | Line 191 | raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o
191   srcdraw.o srcobstr.o virtuals.o:        ../common/otypes.h
192  
193   ambient.o ambcomp.o aniso.o normal.o raycalls.o raytrace.o rpict.o \
194 < rvmain.o rtmain.o rpmain.o persist.o source.o rv3.o \
194 > rvmain.o rtmain.o rpmain.o rcmain.o persist.o source.o rv3.o \
195   srcsamp.o virtuals.o:   ../common/random.h
196  
197 < ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o \
197 > ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o m_bsdf.o \
198   m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o o_mesh.o \
199   mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \
200   raycalls.o raypcalls.o rayfifo.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
201   source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \
202 < text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o: ray.h \
202 > text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o rcmain.o \
203 > rcontrib.o rc2.o rc3.o: ray.h \
204   ../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \
205   ../common/rterror.h ../common/octree.h \
206   ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
# Line 223 | Line 235 | rv2.o: ../common/resolu.h
235   aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o p_data.o \
236   p_func.o t_data.o t_func.o:     func.h ../common/calcomp.h
237  
238 < preload.o:      ../common/object.h ../common/face.h ../common/cone.h \
239 < ../common/instance.h ../common/mesh.h ../common/color.h data.h
238 > preload.o:      data.h func.h ../common/object.h ../common/face.h \
239 > ../common/cone.h ../common/instance.h ../common/mesh.h \
240 > ../common/color.h ../common/bsdf.h ../common/otypes.h
241  
242   rtmain.o rpmain.o rvmain.o persist.o duphead.o \
243   renderopts.o rpict.o:   ../common/paths.h
# Line 242 | Line 255 | m_alias.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mi
255   mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
256   o_mesh.o p_data.o p_func.o source.o sphere.o t_data.o t_func.o \
257   srcobstr.o text.o:              rtotypes.h
258 +
259 + m_bsdf.o:       ambient.h source.h func.h \
260 + ../common/calcomp.h ../common/bsdf.h ../common/random.h
261 +
262 + rcmain.o rcontrib.o rc2.o rc3.o:        rcontrib.h \
263 + ../common/platform.h ../common/paths.h ../common/lookup.h \
264 + func.h ../common/calcomp.h ../common/rtprocess.h
265 +
266 + rcmain.o:       source.h ambient.h
267 +
268 + rcontrib.o:     source.h ../common/otypes.h
269 +
270 + rc2.o:  ../common/resolu.h
271 +
272 + rc3.o:  ../common/selcall.h

Diff Legend

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