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.76 by greg, Wed Sep 2 18:59:01 2015 UTC vs.
Revision 2.81 by greg, Tue Jan 9 05:01:15 2018 UTC

# Line 63 | Line 63 | RLSRC = raycalls.c raypcalls.c rayfifo.c
63   ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
64          $(MODOBJS) $(SUPPOBJS) $(PMOBJS)
65   RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \
66 <        $(MODSRC) $(SUPPSRC) $(PMSRC)
66 >        $(MODSRC) $(SUPPSRC)
67  
68   RAYOBJS = ambcomp.o ambient.o ambio.o freeobjmem.o initotypes.o \
69          preload.o raytrace.o renderopts.o
# Line 90 | Line 90 | 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
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
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  
# Line 231 | 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 278 | 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 289 | Line 291 | rc3.o: ../common/selcall.h
291   #
292   # Photon map include dependencies (via 'gcc -MM -I../common')
293   #
292 –
293 –
294   ambient.o: pmapparm.h pmaptype.h pmapamb.h pmapdata.h
295  
296 < aniso.o ashikhmin.o dielectric.o glass.o m_brdf.o m_bsdf.o normal.o: \
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: \
# 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 – ../common/standard.h ../common/copyright.h ../common/rtio.h \
345 – ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
346 – ../common/fvect.h ../common/rterror.h ../common/octree.h \
347 – ../common/object.h ../common/color.h ../common/lookup.h pmaprand.h \
348 – pmapmat.h ../common/otypes.h source.h rcontrib.h ../common/platform.h \
349 – ../common/paths.h ../common/rtprocess.h ../common/paths.h func.h \
350 – ../common/calcomp.h
351 –
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 367 | 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 385 | 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 401 | Line 404 | pmapsrc.o: pmapsrc.c pmapsrc.h ray.h ../common/standar
404   ../common/color.h pmapparm.h pmaptype.h source.h pmap.h pmapdata.h \
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
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 +
423 + ooccache.o: ooccache.c ooccache.h
424 +
425 + oocsort.o: oocsort.c oocsort.h ../common/fvect.h
426 +
427 + oocbuild.o: oocbuild.c oocbuild.h oocsort.h oococt.h
428 +
429 + oocnn.o: oocnn.c oocnn.h oococt.h oocsort.h

Diff Legend

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