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.72 by greg, Sat Apr 26 15:59:38 2014 UTC vs.
Revision 2.84 by greg, Wed Nov 7 18:34:58 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 61 | Line 62 | RLOBJS = raycalls.o raypcalls.o rayfifo.o
62   RLSRC = raycalls.c raypcalls.c rayfifo.c
63  
64   ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
65 <        $(MODOBJS) $(SUPPOBJS)
65 >        $(MODOBJS) $(SUPPOBJS) $(PMOBJS)
66   RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \
67          $(MODSRC) $(SUPPSRC)
68  
# Line 88 | Line 89 | MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx
89   SUPPOBJS = func.o noise3.o data.o
90   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 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 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  
103   #
# Line 95 | Line 105 | HEADERS = ambient.h ray.h data.h otspecial.h source.h
105   #
106  
107   PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/rcontrib \
108 < $(DESTDIR)/lookamb
108 > $(DESTDIR)/lookamb $(DESTDIR)/mkpmap $(DESTDIR)/pmapdump
109  
110   all:    $(PROGS) $(RCLIB) $(SPECIAL)
111  
# Line 134 | Line 144 | $(DESTDIR)/rcontrib:      $(RCOBJS) $(RLIB)
144   $(DESTDIR)/lookamb:     lookamb.o ambio.o
145          $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
146  
147 + $(DESTDIR)/mkpmap: mkpmap.o $(RLIB)
148 +        $(CC) $(CFLAGS) -o $(DESTDIR)/mkpmap mkpmap.o $(RLIB) $(LIBS)
149 +
150 + $(DESTDIR)/pmapdump: pmapdump.o pmaptype.o pmapparm.o
151 +        $(CC) $(CFLAGS) -o pmapdump pmapdump.o pmaptype.o pmapparm.o $(LIBS)
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 186 | 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 218 | 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 srcobstr.o raytrace.o rv3.o:     otspecial.h
238  
239   rpmain.o rtmain.o rvmain.o rpict.o \
240   srcdraw.o:      ../common/view.h ../common/resolu.h
# Line 265 | Line 281 | rcmain.o rcontrib.o rc2.o rc3.o:       rcontrib.h \
281   ../common/platform.h ../common/paths.h ../common/lookup.h \
282   func.h ../common/calcomp.h ../common/rtprocess.h
283  
284 < rcmain.o:       source.h ambient.h
284 > ambient.o rcmain.o:     source.h ambient.h
285  
286 < rcontrib.o:     source.h ../common/otypes.h
286 > rcontrib.o rv3.o:       source.h ../common/otypes.h
287  
288   rc2.o:  ../common/resolu.h
289  
290   rc3.o:  ../common/selcall.h
291 +
292 + #
293 + # Photon map include dependencies (via 'gcc -MM -I../common')
294 + #
295 + ambient.o: pmapparm.h pmaptype.h pmapamb.h pmapdata.h
296 +
297 + dielectric.o glass.o normal.o m_brdf.o m_bsdf.o ashikhmin.o aniso.o: \
298 +   pmapparm.h pmaptype.h pmapmat.h pmap.h pmapdata.h
299 +  
300 + raycalls.o rpmain.o rcmain.o rtmain.o rvmain.o: \
301 +   pmapparm.h pmaptype.h pmapray.h
302 +  
303 + rcmain.o: pmapparm.h pmaptype.h pmapray.h pmapcontrib.h pmapdata.h
304 +  
305 + raytrace.o: pmapparm.h pmaptype.h pmap.h pmapdata.h
306 +
307 + renderopts.o: pmapparm.h pmaptype.h pmapopt.h
308 +
309 + rpict.o: pmapparm.h pmaptype.h pmapbias.h pmapdata.h pmapdiag.h
310 +
311 + source.o: pmapparm.h pmaptype.h pmap.h pmapdata.h pmapsrc.h
312 +
313 + pmapamb.o: pmapamb.c pmapamb.h pmapdata.h ray.h ../common/standard.h \
314 + ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
315 + ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
316 + ../common/rterror.h ../common/octree.h ../common/object.h \
317 + ../common/color.h pmapparm.h pmaptype.h ../common/lookup.h pmap.h
318 +
319 + pmapbias.o: pmapbias.c pmapbias.h pmapdata.h ray.h ../common/standard.h \
320 + ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
321 + ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
322 + ../common/rterror.h ../common/octree.h ../common/object.h \
323 + ../common/color.h pmapparm.h pmaptype.h ../common/lookup.h pmap.h \
324 + pmaprand.h
325 +
326 + pmap.o: pmap.c pmap.h pmapparm.h pmaptype.h pmapdata.h ray.h \
327 + ../common/standard.h ../common/copyright.h ../common/rtio.h \
328 + ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
329 + ../common/fvect.h ../common/rterror.h ../common/octree.h \
330 + ../common/object.h ../common/color.h ../common/paths.h \
331 + ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmapsrc.h source.h pmaprand.h \
332 + pmapio.h pmapbias.h pmapdiag.h ../common/platform.h ../common/otypes.h
333 +
334 + pmapcontrib.o: pmapcontrib.c pmapcontrib.h pmapdata.h ray.h \
335 + ../common/standard.h ../common/copyright.h ../common/rtio.h \
336 + ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
337 + ../common/fvect.h ../common/rterror.h ../common/octree.h \
338 + ../common/object.h ../common/color.h pmapparm.h pmaptype.h \
339 + ../common/paths.h ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmap.h \
340 + pmapsrc.h source.h pmaprand.h pmapio.h pmapdiag.h ../common/platform.h \
341 + rcontrib.h ../common/rtprocess.h ../common/paths.h func.h \
342 + ../common/calcomp.h ../common/otypes.h
343 +
344 + pmapdata.o: pmapdata.c pmapdata.h ray.h ../common/standard.h \
345 + ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
346 + ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
347 + ../common/rterror.h ../common/octree.h ../common/object.h \
348 + ../common/color.h pmapparm.h pmaptype.h ../common/paths.h \
349 + ../common/lookup.h pmapkdt.h pmapooc.h pmaprand.h pmapmat.h pmap.h \
350 + ../common/otypes.h source.h rcontrib.h ../common/platform.h \
351 + ../common/rtprocess.h ../common/paths.h func.h ../common/calcomp.h \
352 + ../common/random.h pmapkdt.c pmapooc.c
353 +
354 + pmapdiag.o: pmapdiag.c pmapdiag.h ../common/platform.h pmapdata.h ray.h \
355 + ../common/standard.h ../common/copyright.h ../common/rtio.h \
356 + ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
357 + ../common/fvect.h ../common/rterror.h ../common/octree.h \
358 + ../common/object.h ../common/color.h pmapparm.h pmaptype.h \
359 + ../common/lookup.h
360 +
361 + pmapdump.o: pmapdump.c pmapio.h pmapdata.h ray.h ../common/standard.h \
362 + ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
363 + ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
364 + ../common/rterror.h ../common/octree.h ../common/object.h \
365 + ../common/color.h pmapparm.h pmaptype.h ../common/lookup.h \
366 + ../common/rtio.h ../common/resolu.h
367 +
368 + pmapio.o: pmapio.c pmapio.h pmapdata.h ray.h ../common/standard.h \
369 + ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
370 + ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
371 + ../common/rterror.h ../common/octree.h ../common/object.h \
372 + ../common/color.h pmapparm.h pmaptype.h ../common/paths.h \
373 + ../common/lookup.h pmapkdt.h pmapooc.h pmapdiag.h ../common/platform.h \
374 + ../common/resolu.h
375 +
376 + pmapmat.o: pmapmat.c pmapmat.h pmap.h pmapparm.h pmaptype.h pmapdata.h \
377 + ray.h ../common/standard.h ../common/copyright.h ../common/rtio.h \
378 + ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
379 + ../common/fvect.h ../common/rterror.h ../common/octree.h \
380 + ../common/object.h ../common/color.h ../common/lookup.h pmaprand.h \
381 + ../common/otypes.h data.h func.h ../common/calcomp.h ../common/bsdf.h \
382 + ../common/ccolor.h
383 +
384 + pmapopt.o: pmapopt.c pmapparm.h pmaptype.h ../common/rtio.h \
385 + ../common/rterror.h
386 +
387 + pmapparm.o: pmapparm.c pmapparm.h pmaptype.h pmapdata.h ray.h \
388 + ../common/standard.h ../common/copyright.h ../common/rtio.h \
389 + ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
390 + ../common/fvect.h ../common/rterror.h ../common/octree.h \
391 + ../common/object.h ../common/color.h ../common/paths.h \
392 + ../common/lookup.h pmapkdt.h pmapooc.h
393 +
394 + pmapray.o: pmapray.c pmapray.h ray.h ../common/standard.h \
395 + ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
396 + ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
397 + ../common/rterror.h ../common/octree.h ../common/object.h \
398 + ../common/color.h pmapparm.h pmaptype.h pmap.h pmapdata.h \
399 + ../common/lookup.h
400 +
401 + pmapsrc.o: pmapsrc.c pmapsrc.h ray.h ../common/standard.h \
402 + ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
403 + ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
404 + ../common/rterror.h ../common/octree.h ../common/object.h \
405 + ../common/color.h pmapparm.h pmaptype.h source.h pmap.h pmapdata.h \
406 + ../common/lookup.h pmaprand.h ../common/otypes.h
407 +
408 + pmutil.o:       pmap.h pmapio.h pmapdata.h pmapparm.h pmaptype.h pmapbias.h \
409 +  ../common/otypes.h
410 +
411 + pmaptype.o: pmaptype.c pmaptype.h
412 +
413 + mkpmap.o: mkpmap.c pmap.h pmapparm.h pmaptype.h pmapdata.h ray.h \
414 + ../common/standard.h ../common/copyright.h ../common/rtio.h \
415 + ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
416 + ../common/fvect.h ../common/rterror.h ../common/octree.h \
417 + ../common/object.h ../common/color.h ../common/paths.h \
418 + ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmapcontrib.h pmaprand.h \
419 + ambient.h ../common/resolu.h source.h
420 +      
421 + oococt.o: oococt.c oococt.h oocsort.h ooccache.h \
422 + ../common/rtio.h ../common/fvect.h
423 +
424 + ooccache.o: ooccache.c ooccache.h
425 +
426 + oocsort.o: oocsort.c oocsort.h ../common/fvect.h
427 +
428 + oocbuild.o: oocbuild.c oocbuild.h oocsort.h oococt.h
429 +
430 + oocnn.o: oocnn.c oocnn.h oococt.h oocsort.h

Diff Legend

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