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.78 by greg, Mon Sep 26 20:19:30 2016 UTC vs.
Revision 2.82 by greg, Mon Jun 25 20:49:10 2018 UTC

# Line 91 | Line 91 | SUPPSRC = func.c noise3.c data.c
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
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
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  
# Line 201 | Line 201 | rtrace.o rvmain.o rv2.o rv3.o: ../common/octree.h
201   o_instance.o:   ../common/instance.h
202  
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
204 > initotypes.o m_brdf.o m_bsdf.o m_direct.o m_mirror.o normal.o o_cone.o \
205 > preload.o raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o \
206 > srcsupp.o text.o srcdraw.o srcobstr.o virtuals.o:       ../common/otypes.h
207  
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 \
# Line 233 | Line 233 | duphead.o octree.o:    ../common/standard.h ../common/rtm
233  
234   ambio.o:        ../common/fvect.h
235  
236 < initotypes.o srcobstr.o raytrace.o:     otspecial.h
236 > ambient.o initotypes.o srcobstr.o raytrace.o:   otspecial.h
237  
238   rpmain.o rtmain.o rvmain.o rpict.o \
239   srcdraw.o:      ../common/view.h ../common/resolu.h
# Line 280 | Line 280 | 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
283 > ambient.o rcmain.o:     source.h ambient.h
284  
285   rcontrib.o:     source.h ../common/otypes.h
286  
# Line 326 | Line 326 | pmap.o: pmap.c pmap.h pmapparm.h pmaptype.h pmapdata.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
329 > ../common/object.h ../common/color.h ../common/paths.h \
330 > ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmapsrc.h source.h pmaprand.h \
331 > pmapio.h pmapbias.h pmapdiag.h ../common/platform.h ../common/otypes.h
332  
333   pmapcontrib.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 \
338 > ../common/paths.h ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmap.h \
339 > pmapsrc.h source.h pmaprand.h pmapio.h pmapdiag.h ../common/platform.h \
340 > rcontrib.h ../common/rtprocess.h ../common/paths.h func.h \
341 > ../common/calcomp.h ../common/otypes.h
342 >
343 > pmapdata.o: pmapdata.c pmapdata.h ray.h ../common/standard.h \
344 > ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
345 > ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
346 > ../common/rterror.h ../common/octree.h ../common/object.h \
347 > ../common/color.h pmapparm.h pmaptype.h ../common/paths.h \
348 > ../common/lookup.h pmapkdt.h pmapooc.h pmaprand.h pmapmat.h pmap.h \
349 > ../common/otypes.h source.h rcontrib.h ../common/platform.h \
350   ../common/rtprocess.h ../common/paths.h func.h ../common/calcomp.h \
351 < ../common/otypes.h
351 > ../common/random.h pmapkdt.c pmapooc.c
352  
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 \
# Line 368 | Line 368 | pmapio.o: pmapio.c pmapio.h pmapdata.h ray.h ../common
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
371 > ../common/color.h pmapparm.h pmaptype.h ../common/paths.h \
372 > ../common/lookup.h pmapkdt.h pmapooc.h pmapdiag.h ../common/platform.h \
373 > ../common/resolu.h
374  
375   pmapmat.o: pmapmat.c pmapmat.h pmap.h pmapparm.h pmaptype.h pmapdata.h \
376   ray.h ../common/standard.h ../common/copyright.h ../common/rtio.h \
# Line 386 | Line 387 | pmapparm.o: pmapparm.c pmapparm.h pmaptype.h pmapdata.
387   ../common/standard.h ../common/copyright.h ../common/rtio.h \
388   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
389   ../common/fvect.h ../common/rterror.h ../common/octree.h \
390 < ../common/object.h ../common/color.h ../common/lookup.h
390 > ../common/object.h ../common/color.h ../common/paths.h \
391 > ../common/lookup.h pmapkdt.h pmapooc.h
392  
393   pmapray.o: pmapray.c pmapray.h ray.h ../common/standard.h \
394   ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
# Line 403 | Line 405 | pmapsrc.o: pmapsrc.c pmapsrc.h ray.h ../common/standar
405   ../common/lookup.h pmaprand.h ../common/otypes.h
406  
407   pmutil.o:       pmap.h pmapio.h pmapdata.h pmapparm.h pmaptype.h pmapbias.h \
408 < ../common/otypes.h
408 >  ../common/otypes.h
409  
410   pmaptype.o: pmaptype.c pmaptype.h
411  
412 + mkpmap.o: mkpmap.c pmap.h pmapparm.h pmaptype.h pmapdata.h ray.h \
413 + ../common/standard.h ../common/copyright.h ../common/rtio.h \
414 + ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
415 + ../common/fvect.h ../common/rterror.h ../common/octree.h \
416 + ../common/object.h ../common/color.h ../common/paths.h \
417 + ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmapcontrib.h pmaprand.h \
418 + ambient.h ../common/resolu.h source.h
419 +      
420   oococt.o: oococt.c oococt.h oocsort.h ooccache.h \
421   ../common/rtio.h ../common/fvect.h
422  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines