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.62 by greg, Fri Feb 18 00:40:25 2011 UTC vs.
Revision 2.79 by greg, Thu Sep 29 21:51:58 2016 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  
63   ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
64 <        $(MODOBJS) $(SUPPOBJS)
64 >        $(MODOBJS) $(SUPPOBJS) $(PMOBJS)
65   RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \
66          $(MODSRC) $(SUPPSRC)
67  
# 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 m_bsdf.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 m_bsdf.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 83 | Line 88 | MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx
88   SUPPOBJS = func.o noise3.o data.o
89   SUPPSRC = func.c noise3.c data.c
90  
91 + PMOBJS = pmap.o pmapsrc.o pmapmat.o pmaprand.o pmapio.o pmapdata.o \
92 +         pmapbias.o pmapparm.o pmapcontrib.o pmapamb.o pmapray.o pmapopt.o \
93 +         pmapdiag.o pmaptype.o oocmorton.o oococt.o oocsort.o oocbuild.o \
94 +         oocnn.o ooccache.o pmutil.o pmcontrib2.o
95 + PMSRC = pmap.c pmapsrc.c pmapmat.c pmaprand.c pmapio.c pmapdata.c \
96 +        pmapbias.c pmapparm.c pmapcontrib.c pmapamb.c pmapray.c pmapopt.c \
97 +        pmapdiag.c pmaptype.c pmapkdt.c pmapooc.c oocmorton.c oococt.c \
98 +        oocsort.c oocbuild.c oocnn.c ooccache.c pmutil.c pmcontrib2.c
99 +
100   HEADERS = ambient.h ray.h data.h otspecial.h source.h
101  
102   #
103   # What this makefile produces:
104   #
105  
106 < PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/lookamb
106 > PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/rcontrib \
107 > $(DESTDIR)/lookamb $(DESTDIR)/mkpmap $(DESTDIR)/pmapdump
108  
109   all:    $(PROGS) $(RCLIB) $(SPECIAL)
110  
111   install:        all rayinit.cal
112          $(INSTALL) $(PROGS) $(INSTDIR)
113          cd $(INSTDIR) ; rm -f rview ; ln -s rvu rview
114 +        cd $(INSTDIR) ; rm -f rtcontrib ; ln -s rcontrib rtcontrib
115          rm -f $(LIBDIR)/rayinit.cal
116          cp rayinit.cal $(LIBDIR)
117  
118   ogl:    
119  
120   clean:
121 <        set nonomatch; rm -f $(PROGS) *.o core
121 >        set nonomatch; rm -f $(PROGS) *.o
122  
123   lint:   $(RVSRC)
124          $(LINT) $(LINTFLAGS) -DRVIEW $(RVSRC) $(LIBS)
# Line 121 | Line 137 | $(DESTDIR)/rvu:        $(RVOBJS) $(RCLIB) $(RLIB)
137          $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RCLIB) \
138   $(RLIB) $(LIBS) $(DLIBS)
139  
140 + $(DESTDIR)/rcontrib:      $(RCOBJS) $(RLIB)
141 +        $(CC) $(CFLAGS) -o $(DESTDIR)/rcontrib $(RCOBJS) $(RLIB) $(LIBS)
142 +
143   $(DESTDIR)/lookamb:     lookamb.o ambio.o
144          $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
145  
146 + $(DESTDIR)/mkpmap: mkpmap.o $(RLIB)
147 +        $(CC) $(CFLAGS) -o $(DESTDIR)/mkpmap mkpmap.o $(RLIB) $(LIBS)
148 +
149 + $(DESTDIR)/pmapdump: pmapdump.o pmaptype.o pmapparm.o
150 +        $(CC) $(CFLAGS) -o pmapdump pmapdump.o pmaptype.o pmapparm.o $(LIBS)
151 +
152   $(RLIB):        $(ROBJS) Version.o
153          rm -f $(RLIB)
154          ar rc $(RLIB) $(ROBJS) Version.o
# Line 175 | Line 200 | rtrace.o rvmain.o rv2.o rv3.o: ../common/octree.h
200  
201   o_instance.o:   ../common/instance.h
202  
203 < ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o initotypes.o \
204 < m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o preload.o \
203 > ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o glass.o \
204 > initotypes.o m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o preload.o \
205   raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \
206   srcdraw.o srcobstr.o virtuals.o:        ../common/otypes.h
207  
208 < ambient.o ambcomp.o aniso.o normal.o raycalls.o raytrace.o rpict.o \
209 < rvmain.o rtmain.o rpmain.o persist.o source.o rv3.o \
208 > ambient.o ambcomp.o aniso.o ashikhmin.o normal.o raycalls.o raytrace.o \
209 > rpict.o rvmain.o rtmain.o rpmain.o rcmain.o persist.o source.o rv3.o \
210   srcsamp.o virtuals.o:   ../common/random.h
211  
212 < ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o m_bsdf.o \
213 < m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o o_mesh.o \
214 < mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \
212 > ambcomp.o ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o \
213 > glass.o m_bsdf.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o \
214 > o_mesh.o mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \
215   raycalls.o raypcalls.o rayfifo.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
216   source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \
217 < text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o: ray.h \
217 > text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o rcmain.o \
218 > rcontrib.o rc2.o rc3.o: ray.h \
219   ../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \
220   ../common/rterror.h ../common/octree.h \
221   ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
# Line 212 | Line 238 | initotypes.o srcobstr.o raytrace.o:    otspecial.h
238   rpmain.o rtmain.o rvmain.o rpict.o \
239   srcdraw.o:      ../common/view.h ../common/resolu.h
240  
241 + rpict.o:        ../common/hilbert.h
242 +
243   x11.o x11twind.o: x11twind.h
244  
245   x11.o:  x11icon.h
# Line 224 | Line 252 | rv2.o: ../common/resolu.h
252   aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o p_data.o \
253   p_func.o t_data.o t_func.o:     func.h ../common/calcomp.h
254  
255 < preload.o:      ../common/object.h ../common/face.h ../common/cone.h \
256 < ../common/instance.h ../common/mesh.h ../common/color.h data.h
255 > preload.o:      data.h func.h ../common/object.h ../common/face.h \
256 > ../common/cone.h ../common/instance.h ../common/mesh.h \
257 > ../common/color.h ../common/bsdf.h ../common/otypes.h
258  
259   rtmain.o rpmain.o rvmain.o persist.o duphead.o \
260   renderopts.o rpict.o:   ../common/paths.h
# Line 238 | Line 267 | o_mesh.o:      ../common/mesh.h
267  
268   noise3.o:       ../common/calcomp.h
269  
270 < aniso.o dielectric.o freeobjmem.o glass.o initotypes.o \
270 > aniso.o ashikhmin.o dielectric.o freeobjmem.o glass.o initotypes.o \
271   m_alias.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o \
272   mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
273   o_mesh.o p_data.o p_func.o source.o sphere.o t_data.o t_func.o \
274   srcobstr.o text.o:              rtotypes.h
275  
276   m_bsdf.o:       ambient.h source.h func.h \
277 < ../common/calcomp.h ../common/paths.h ../common/bsdf.h ../common/random.h
277 > ../common/calcomp.h ../common/bsdf.h ../common/random.h
278 >
279 > rcmain.o rcontrib.o rc2.o rc3.o:        rcontrib.h \
280 > ../common/platform.h ../common/paths.h ../common/lookup.h \
281 > func.h ../common/calcomp.h ../common/rtprocess.h
282 >
283 > rcmain.o:       source.h ambient.h
284 >
285 > rcontrib.o:     source.h ../common/otypes.h
286 >
287 > rc2.o:  ../common/resolu.h
288 >
289 > rc3.o:  ../common/selcall.h
290 >
291 > #
292 > # Photon map include dependencies (via 'gcc -MM -I../common')
293 > #
294 > ambient.o: pmapparm.h pmaptype.h pmapamb.h pmapdata.h
295 >
296 > dielectric.o glass.o normal.o m_brdf.o m_bsdf.o ashikhmin.o aniso.o: \
297 >   pmapparm.h pmaptype.h pmapmat.h pmap.h pmapdata.h
298 >  
299 > raycalls.o rpmain.o rcmain.o rtmain.o rvmain.o: \
300 >   pmapparm.h pmaptype.h pmapray.h
301 >  
302 > rcmain.o: pmapparm.h pmaptype.h pmapray.h pmapcontrib.h pmapdata.h
303 >  
304 > raytrace.o: pmapparm.h pmaptype.h pmap.h pmapdata.h
305 >
306 > renderopts.o: pmapparm.h pmaptype.h pmapopt.h
307 >
308 > rpict.o: pmapparm.h pmaptype.h pmapbias.h pmapdata.h pmapdiag.h
309 >
310 > source.o: pmapparm.h pmaptype.h pmap.h pmapdata.h pmapsrc.h
311 >
312 > pmapamb.o: pmapamb.c pmapamb.h pmapdata.h ray.h ../common/standard.h \
313 > ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
314 > ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
315 > ../common/rterror.h ../common/octree.h ../common/object.h \
316 > ../common/color.h pmapparm.h pmaptype.h ../common/lookup.h pmap.h
317 >
318 > pmapbias.o: pmapbias.c pmapbias.h pmapdata.h ray.h ../common/standard.h \
319 > ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
320 > ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
321 > ../common/rterror.h ../common/octree.h ../common/object.h \
322 > ../common/color.h pmapparm.h pmaptype.h ../common/lookup.h pmap.h \
323 > pmaprand.h
324 >
325 > pmap.o: pmap.c pmap.h pmapparm.h pmaptype.h pmapdata.h ray.h \
326 > ../common/standard.h ../common/copyright.h ../common/rtio.h \
327 > ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
328 > ../common/fvect.h ../common/rterror.h ../common/octree.h \
329 > ../common/object.h ../common/color.h ../common/lookup.h pmapmat.h \
330 > pmapsrc.h source.h pmaprand.h pmapio.h pmapbias.h pmapdiag.h \
331 > ../common/platform.h ../common/otypes.h
332 >
333 > pmapcontrib.o pmcontrib2.o: pmapcontrib.c pmapcontrib.h pmapdata.h ray.h \
334 > ../common/standard.h ../common/copyright.h ../common/rtio.h \
335 > ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
336 > ../common/fvect.h ../common/rterror.h ../common/octree.h \
337 > ../common/object.h ../common/color.h pmapparm.h pmaptype.h \
338 > ../common/lookup.h pmap.h pmapmat.h pmapsrc.h source.h pmaprand.h \
339 > pmapio.h pmapdiag.h ../common/platform.h rcontrib.h ../common/paths.h \
340 > ../common/rtprocess.h ../common/paths.h func.h ../common/calcomp.h \
341 > ../common/otypes.h
342 >
343 > pmapdata.o: pmapdata.c pmap.h pmapparm.h pmaptype.h pmapdata.h ray.h \
344 > pmapkdt.h pmapkdt.c pmapooc.h pmapooc.c oococt.h oocnn.h ooccache.h \
345 > ../common/standard.h ../common/copyright.h ../common/rtio.h \
346 > ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
347 > ../common/fvect.h ../common/rterror.h ../common/octree.h \
348 > ../common/object.h ../common/color.h ../common/lookup.h pmaprand.h \
349 > pmapmat.h ../common/otypes.h source.h rcontrib.h ../common/platform.h \
350 > ../common/paths.h ../common/rtprocess.h ../common/paths.h func.h \
351 > ../common/calcomp.h
352 >
353 > pmapdiag.o: pmapdiag.c pmapdiag.h ../common/platform.h pmapdata.h ray.h \
354 > ../common/standard.h ../common/copyright.h ../common/rtio.h \
355 > ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
356 > ../common/fvect.h ../common/rterror.h ../common/octree.h \
357 > ../common/object.h ../common/color.h pmapparm.h pmaptype.h \
358 > ../common/lookup.h
359 >
360 > pmapdump.o: pmapdump.c pmapio.h pmapdata.h ray.h ../common/standard.h \
361 > ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
362 > ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
363 > ../common/rterror.h ../common/octree.h ../common/object.h \
364 > ../common/color.h pmapparm.h pmaptype.h ../common/lookup.h \
365 > ../common/rtio.h ../common/resolu.h
366 >
367 > pmapio.o: pmapio.c pmapio.h pmapdata.h ray.h ../common/standard.h \
368 > ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
369 > ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
370 > ../common/rterror.h ../common/octree.h ../common/object.h \
371 > ../common/color.h pmapparm.h pmaptype.h ../common/lookup.h pmapdiag.h \
372 > ../common/platform.h ../common/resolu.h
373 >
374 > pmapmat.o: pmapmat.c pmapmat.h pmap.h pmapparm.h pmaptype.h pmapdata.h \
375 > ray.h ../common/standard.h ../common/copyright.h ../common/rtio.h \
376 > ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
377 > ../common/fvect.h ../common/rterror.h ../common/octree.h \
378 > ../common/object.h ../common/color.h ../common/lookup.h pmaprand.h \
379 > ../common/otypes.h data.h func.h ../common/calcomp.h ../common/bsdf.h \
380 > ../common/ccolor.h
381 >
382 > pmapopt.o: pmapopt.c pmapparm.h pmaptype.h ../common/rtio.h \
383 > ../common/rterror.h
384 >
385 > pmapparm.o: pmapparm.c pmapparm.h pmaptype.h pmapdata.h ray.h \
386 > ../common/standard.h ../common/copyright.h ../common/rtio.h \
387 > ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
388 > ../common/fvect.h ../common/rterror.h ../common/octree.h \
389 > ../common/object.h ../common/color.h ../common/lookup.h
390 >
391 > pmapray.o: pmapray.c pmapray.h ray.h ../common/standard.h \
392 > ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
393 > ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
394 > ../common/rterror.h ../common/octree.h ../common/object.h \
395 > ../common/color.h pmapparm.h pmaptype.h pmap.h pmapdata.h \
396 > ../common/lookup.h
397 >
398 > pmapsrc.o: pmapsrc.c pmapsrc.h ray.h ../common/standard.h \
399 > ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
400 > ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
401 > ../common/rterror.h ../common/octree.h ../common/object.h \
402 > ../common/color.h pmapparm.h pmaptype.h source.h pmap.h pmapdata.h \
403 > ../common/lookup.h pmaprand.h ../common/otypes.h
404 >
405 > pmutil.o:       pmap.h pmapio.h pmapdata.h pmapparm.h pmaptype.h pmapbias.h \
406 > ../common/otypes.h
407 >
408 > pmaptype.o: pmaptype.c pmaptype.h
409 >
410 > oococt.o: oococt.c oococt.h oocsort.h ooccache.h \
411 > ../common/rtio.h ../common/fvect.h
412 >
413 > ooccache.o: ooccache.c ooccache.h
414 >
415 > oocsort.o: oocsort.c oocsort.h ../common/fvect.h
416 >
417 > oocbuild.o: oocbuild.c oocbuild.h oocsort.h oococt.h
418 >
419 > oocnn.o: oocnn.c oocnn.h oococt.h oocsort.h

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines