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.75 by greg, Fri Aug 21 01:57:56 2015 UTC vs.
Revision 2.85 by greg, Thu Nov 8 00:54:07 2018 UTC

# Line 8 | Line 8 | MACH = -DBSD
8   CFLAGS = -I../common -L../lib $(OPT) $(MACH)
9   SPECIAL =
10   CC = cc
11 + AR = ar
12   MLIB = -lm
13   LINT = lint
14   LINTFLAGS = -DBSD
# Line 63 | Line 64 | RLSRC = raycalls.c raypcalls.c rayfifo.c
64   ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
65          $(MODOBJS) $(SUPPOBJS) $(PMOBJS)
66   RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \
67 <        $(MODSRC) $(SUPPSRC) $(PMSRC)
67 >        $(MODSRC) $(SUPPSRC)
68  
69   RAYOBJS = ambcomp.o ambient.o ambio.o freeobjmem.o initotypes.o \
70          preload.o raytrace.o renderopts.o
# Line 90 | Line 91 | SUPPSRC = func.c noise3.c data.c
91  
92   PMOBJS = pmap.o pmapsrc.o pmapmat.o pmaprand.o pmapio.o pmapdata.o \
93           pmapbias.o pmapparm.o pmapcontrib.o pmapamb.o pmapray.o pmapopt.o \
94 <         pmapdiag.o pmaptype.o
94 >         pmapdiag.o pmaptype.o oocmorton.o oococt.o oocsort.o oocbuild.o \
95 >         oocnn.o ooccache.o pmutil.o pmcontrib2.o
96   PMSRC = pmap.c pmapsrc.c pmapmat.c pmaprand.c pmapio.c pmapdata.c \
97          pmapbias.c pmapparm.c pmapcontrib.c pmapamb.c pmapray.c pmapopt.c \
98 <        pmapdiag.c pmaptype.c
98 >        pmapdiag.c pmaptype.c pmapkdt.c pmapooc.c oocmorton.c oococt.c \
99 >        oocsort.c oocbuild.c oocnn.c ooccache.c pmutil.c pmcontrib2.c
100  
101   HEADERS = ambient.h ray.h data.h otspecial.h source.h
102  
# Line 149 | Line 152 | $(DESTDIR)/pmapdump: pmapdump.o pmaptype.o pmapparm.o
152  
153   $(RLIB):        $(ROBJS) Version.o
154          rm -f $(RLIB)
155 <        ar rc $(RLIB) $(ROBJS) Version.o
155 >        $(AR) rc $(RLIB) $(ROBJS) Version.o
156          -ranlib $(RLIB)
157  
158   $(RCLIB):       $(RLOBJS)
159          rm -f $(RCLIB)
160 <        ar rc $(RCLIB) $(RLOBJS)
160 >        $(AR) rc $(RCLIB) $(RLOBJS)
161          -ranlib $(RCLIB)
162  
163   #
# Line 199 | Line 202 | rtrace.o rvmain.o rv2.o rv3.o: ../common/octree.h
202   o_instance.o:   ../common/instance.h
203  
204   ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o glass.o \
205 < initotypes.o m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o preload.o \
206 < raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \
207 < srcdraw.o srcobstr.o virtuals.o:        ../common/otypes.h
205 > initotypes.o m_brdf.o m_bsdf.o m_direct.o m_mirror.o normal.o o_cone.o \
206 > preload.o raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o \
207 > srcsupp.o text.o srcdraw.o srcobstr.o virtuals.o:       ../common/otypes.h
208  
209   ambient.o ambcomp.o aniso.o ashikhmin.o normal.o raycalls.o raytrace.o \
210   rpict.o rvmain.o rtmain.o rpmain.o rcmain.o persist.o source.o rv3.o \
# Line 221 | Line 224 | rcontrib.o rc2.o rc3.o:        ray.h \
224   rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h ../common/resolu.h
225  
226   m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o \
227 < rpict.o rpmain.o rtmain.o rvmain.o rv2.o source.o srcdraw.o \
227 > rpict.o rpmain.o rtmain.o rvmain.o source.o srcdraw.o \
228   srcobstr.o srcsamp.o srcsupp.o virtuals.o:      source.h
229  
230   cone.o data.o devcomm.o initotypes.o fprism.o preload.o \
# Line 231 | Line 234 | duphead.o octree.o:    ../common/standard.h ../common/rtm
234  
235   ambio.o:        ../common/fvect.h
236  
237 < initotypes.o srcobstr.o raytrace.o:     otspecial.h
237 > ambient.o initotypes.o m_alias.o pmapcontrib.o pmapkdt.o \
238 > pmapooc.o pmapsrc.o pmcontrib2.o \
239 > raytrace.o rtrace.o rv2.o rv3.o source.o \
240 > srcdraw.o srcobstr.o virtuals.o:        otspecial.h
241  
242   rpmain.o rtmain.o rvmain.o rpict.o \
243   srcdraw.o:      ../common/view.h ../common/resolu.h
# Line 278 | Line 284 | rcmain.o rcontrib.o rc2.o rc3.o:       rcontrib.h \
284   ../common/platform.h ../common/paths.h ../common/lookup.h \
285   func.h ../common/calcomp.h ../common/rtprocess.h
286  
287 < rcmain.o:       source.h ambient.h
287 > ambient.o rcmain.o:     ambient.h
288  
289 + rcmain.o:       source.h
290 +
291   rcontrib.o:     source.h ../common/otypes.h
292  
293   rc2.o:  ../common/resolu.h
# Line 289 | Line 297 | rc3.o: ../common/selcall.h
297   #
298   # Photon map include dependencies (via 'gcc -MM -I../common')
299   #
292 –
293 –
300   ambient.o: pmapparm.h pmaptype.h pmapamb.h pmapdata.h
301  
302 < dielectric.o glass.o normal.o: \
302 > dielectric.o glass.o normal.o m_brdf.o m_bsdf.o ashikhmin.o aniso.o: \
303     pmapparm.h pmaptype.h pmapmat.h pmap.h pmapdata.h
304    
305   raycalls.o rpmain.o rcmain.o rtmain.o rvmain.o: \
# Line 326 | Line 332 | pmap.o: pmap.c pmap.h pmapparm.h pmaptype.h pmapdata.h
332   ../common/standard.h ../common/copyright.h ../common/rtio.h \
333   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
334   ../common/fvect.h ../common/rterror.h ../common/octree.h \
335 < ../common/object.h ../common/color.h ../common/lookup.h pmapmat.h \
336 < pmapsrc.h source.h pmaprand.h pmapio.h pmapbias.h pmapdiag.h \
337 < ../common/platform.h ../common/otypes.h
335 > ../common/object.h ../common/color.h ../common/paths.h \
336 > ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmapsrc.h source.h pmaprand.h \
337 > pmapio.h pmapbias.h pmapdiag.h ../common/platform.h ../common/otypes.h
338  
339   pmapcontrib.o: pmapcontrib.c pmapcontrib.h pmapdata.h ray.h \
340   ../common/standard.h ../common/copyright.h ../common/rtio.h \
341   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
342   ../common/fvect.h ../common/rterror.h ../common/octree.h \
343   ../common/object.h ../common/color.h pmapparm.h pmaptype.h \
344 < ../common/lookup.h pmap.h pmapmat.h pmapsrc.h source.h pmaprand.h \
345 < pmapio.h pmapdiag.h ../common/platform.h rcontrib.h ../common/paths.h \
344 > ../common/paths.h ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmap.h \
345 > pmapsrc.h source.h pmaprand.h pmapio.h pmapdiag.h ../common/platform.h \
346 > rcontrib.h ../common/rtprocess.h ../common/paths.h func.h \
347 > ../common/calcomp.h ../common/otypes.h
348 >
349 > pmapdata.o: pmapdata.c pmapdata.h ray.h ../common/standard.h \
350 > ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
351 > ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
352 > ../common/rterror.h ../common/octree.h ../common/object.h \
353 > ../common/color.h pmapparm.h pmaptype.h ../common/paths.h \
354 > ../common/lookup.h pmapkdt.h pmapooc.h pmaprand.h pmapmat.h pmap.h \
355 > ../common/otypes.h source.h rcontrib.h ../common/platform.h \
356   ../common/rtprocess.h ../common/paths.h func.h ../common/calcomp.h \
357 < ../common/otypes.h
357 > ../common/random.h pmapkdt.c pmapooc.c
358  
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 –
359   pmapdiag.o: pmapdiag.c pmapdiag.h ../common/platform.h pmapdata.h ray.h \
360   ../common/standard.h ../common/copyright.h ../common/rtio.h \
361   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
# Line 367 | Line 374 | pmapio.o: pmapio.c pmapio.h pmapdata.h ray.h ../common
374   ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
375   ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
376   ../common/rterror.h ../common/octree.h ../common/object.h \
377 < ../common/color.h pmapparm.h pmaptype.h ../common/lookup.h pmapdiag.h \
378 < ../common/platform.h ../common/resolu.h
377 > ../common/color.h pmapparm.h pmaptype.h ../common/paths.h \
378 > ../common/lookup.h pmapkdt.h pmapooc.h pmapdiag.h ../common/platform.h \
379 > ../common/resolu.h
380  
381   pmapmat.o: pmapmat.c pmapmat.h pmap.h pmapparm.h pmaptype.h pmapdata.h \
382   ray.h ../common/standard.h ../common/copyright.h ../common/rtio.h \
# Line 385 | Line 393 | pmapparm.o: pmapparm.c pmapparm.h pmaptype.h pmapdata.
393   ../common/standard.h ../common/copyright.h ../common/rtio.h \
394   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
395   ../common/fvect.h ../common/rterror.h ../common/octree.h \
396 < ../common/object.h ../common/color.h ../common/lookup.h
396 > ../common/object.h ../common/color.h ../common/paths.h \
397 > ../common/lookup.h pmapkdt.h pmapooc.h
398  
399   pmapray.o: pmapray.c pmapray.h ray.h ../common/standard.h \
400   ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
# Line 401 | Line 410 | pmapsrc.o: pmapsrc.c pmapsrc.h ray.h ../common/standar
410   ../common/color.h pmapparm.h pmaptype.h source.h pmap.h pmapdata.h \
411   ../common/lookup.h pmaprand.h ../common/otypes.h
412  
413 + pmutil.o:       pmap.h pmapio.h pmapdata.h pmapparm.h pmaptype.h pmapbias.h \
414 +  ../common/otypes.h
415 +
416   pmaptype.o: pmaptype.c pmaptype.h
417  
418 + mkpmap.o: mkpmap.c pmap.h pmapparm.h pmaptype.h pmapdata.h ray.h \
419 + ../common/standard.h ../common/copyright.h ../common/rtio.h \
420 + ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
421 + ../common/fvect.h ../common/rterror.h ../common/octree.h \
422 + ../common/object.h ../common/color.h ../common/paths.h \
423 + ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmapcontrib.h pmaprand.h \
424 + ambient.h ../common/resolu.h source.h
425 +      
426 + oococt.o: oococt.c oococt.h oocsort.h ooccache.h \
427 + ../common/rtio.h ../common/fvect.h
428 +
429 + ooccache.o: ooccache.c ooccache.h
430 +
431 + oocsort.o: oocsort.c oocsort.h ../common/fvect.h
432 +
433 + oocbuild.o: oocbuild.c oocbuild.h oocsort.h oococt.h
434 +
435 + oocnn.o: oocnn.c oocnn.h oococt.h oocsort.h

Diff Legend

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