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.75 by greg, Fri Aug 21 01:57:56 2015 UTC vs.
Revision 2.87 by greg, Tue Jan 19 23:31:47 2021 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 108 | Line 111 | all:   $(PROGS) $(RCLIB) $(SPECIAL)
111  
112   install:        all rayinit.cal
113          $(INSTALL) $(PROGS) $(INSTDIR)
111 –        cd $(INSTDIR) ; rm -f rview ; ln -s rvu rview
112 –        cd $(INSTDIR) ; rm -f rtcontrib ; ln -s rcontrib rtcontrib
114          rm -f $(LIBDIR)/rayinit.cal
115          cp rayinit.cal $(LIBDIR)
116  
# Line 149 | Line 150 | $(DESTDIR)/pmapdump: pmapdump.o pmaptype.o pmapparm.o
150  
151   $(RLIB):        $(ROBJS) Version.o
152          rm -f $(RLIB)
153 <        ar rc $(RLIB) $(ROBJS) Version.o
153 >        $(AR) rc $(RLIB) $(ROBJS) Version.o
154          -ranlib $(RLIB)
155  
156   $(RCLIB):       $(RLOBJS)
157          rm -f $(RCLIB)
158 <        ar rc $(RCLIB) $(RLOBJS)
158 >        $(AR) rc $(RCLIB) $(RLOBJS)
159          -ranlib $(RCLIB)
160  
161   #
# Line 174 | Line 175 | devcomm.o:     devcomm.c
175  
176   Version.c:      VERSION $(RSRC) $(HEADERS)
177          ( cat VERSION ; date ; whoami ; hostname ) > Version.c
178 <        ed - Version.c < verscript.ed
178 >        ed - Version.c < verscript.ed || rm Version.c
179  
180   #
181   # Include dependencies:
# Line 199 | Line 200 | rtrace.o rvmain.o rv2.o rv3.o: ../common/octree.h
200   o_instance.o:   ../common/instance.h
201  
202   ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o glass.o \
203 < initotypes.o m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o preload.o \
204 < raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \
205 < srcdraw.o srcobstr.o virtuals.o:        ../common/otypes.h
203 > initotypes.o m_brdf.o m_bsdf.o m_direct.o m_mirror.o normal.o o_cone.o \
204 > preload.o raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o \
205 > srcsupp.o text.o srcdraw.o srcobstr.o virtuals.o:       ../common/otypes.h
206  
207   ambient.o ambcomp.o aniso.o ashikhmin.o normal.o raycalls.o raytrace.o \
208   rpict.o rvmain.o rtmain.o rpmain.o rcmain.o persist.o source.o rv3.o \
# Line 221 | Line 222 | rcontrib.o rc2.o rc3.o:        ray.h \
222   rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h ../common/resolu.h
223  
224   m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o \
225 < rpict.o rpmain.o rtmain.o rvmain.o rv2.o source.o srcdraw.o \
225 > rpict.o rpmain.o rtmain.o rvmain.o source.o srcdraw.o \
226   srcobstr.o srcsamp.o srcsupp.o virtuals.o:      source.h
227  
228   cone.o data.o devcomm.o initotypes.o fprism.o preload.o \
# Line 231 | Line 232 | duphead.o octree.o:    ../common/standard.h ../common/rtm
232  
233   ambio.o:        ../common/fvect.h
234  
235 < initotypes.o srcobstr.o raytrace.o:     otspecial.h
235 > ambient.o initotypes.o m_alias.o pmapcontrib.o pmapkdt.o \
236 > pmapooc.o pmapsrc.o pmcontrib2.o \
237 > raytrace.o rtrace.o rv2.o rv3.o source.o \
238 > srcdraw.o srcobstr.o virtuals.o:        otspecial.h
239  
240   rpmain.o rtmain.o rvmain.o rpict.o \
241   srcdraw.o:      ../common/view.h ../common/resolu.h
# Line 278 | Line 282 | rcmain.o rcontrib.o rc2.o rc3.o:       rcontrib.h \
282   ../common/platform.h ../common/paths.h ../common/lookup.h \
283   func.h ../common/calcomp.h ../common/rtprocess.h
284  
285 < rcmain.o:       source.h ambient.h
285 > ambient.o rcmain.o:     ambient.h
286  
287 + rcmain.o:       source.h
288 +
289   rcontrib.o:     source.h ../common/otypes.h
290  
291   rc2.o:  ../common/resolu.h
# Line 289 | Line 295 | rc3.o: ../common/selcall.h
295   #
296   # Photon map include dependencies (via 'gcc -MM -I../common')
297   #
292 –
293 –
298   ambient.o: pmapparm.h pmaptype.h pmapamb.h pmapdata.h
299  
300 < dielectric.o glass.o normal.o: \
300 > dielectric.o glass.o normal.o m_brdf.o m_bsdf.o ashikhmin.o aniso.o: \
301     pmapparm.h pmaptype.h pmapmat.h pmap.h pmapdata.h
302    
303   raycalls.o rpmain.o rcmain.o rtmain.o rvmain.o: \
# Line 326 | Line 330 | pmap.o: pmap.c pmap.h pmapparm.h pmaptype.h pmapdata.h
330   ../common/standard.h ../common/copyright.h ../common/rtio.h \
331   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
332   ../common/fvect.h ../common/rterror.h ../common/octree.h \
333 < ../common/object.h ../common/color.h ../common/lookup.h pmapmat.h \
334 < pmapsrc.h source.h pmaprand.h pmapio.h pmapbias.h pmapdiag.h \
335 < ../common/platform.h ../common/otypes.h
333 > ../common/object.h ../common/color.h ../common/paths.h \
334 > ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmapsrc.h source.h pmaprand.h \
335 > pmapio.h pmapbias.h pmapdiag.h ../common/platform.h ../common/otypes.h
336  
337   pmapcontrib.o: pmapcontrib.c pmapcontrib.h pmapdata.h ray.h \
338   ../common/standard.h ../common/copyright.h ../common/rtio.h \
339   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
340   ../common/fvect.h ../common/rterror.h ../common/octree.h \
341   ../common/object.h ../common/color.h pmapparm.h pmaptype.h \
342 < ../common/lookup.h pmap.h pmapmat.h pmapsrc.h source.h pmaprand.h \
343 < pmapio.h pmapdiag.h ../common/platform.h rcontrib.h ../common/paths.h \
342 > ../common/paths.h ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmap.h \
343 > pmapsrc.h source.h pmaprand.h pmapio.h pmapdiag.h ../common/platform.h \
344 > rcontrib.h ../common/rtprocess.h ../common/paths.h func.h \
345 > ../common/calcomp.h ../common/otypes.h
346 >
347 > pmapdata.o: pmapdata.c pmapdata.h ray.h ../common/standard.h \
348 > ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
349 > ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
350 > ../common/rterror.h ../common/octree.h ../common/object.h \
351 > ../common/color.h pmapparm.h pmaptype.h ../common/paths.h \
352 > ../common/lookup.h pmapkdt.h pmapooc.h pmaprand.h pmapmat.h pmap.h \
353 > ../common/otypes.h source.h rcontrib.h ../common/platform.h \
354   ../common/rtprocess.h ../common/paths.h func.h ../common/calcomp.h \
355 < ../common/otypes.h
355 > ../common/random.h pmapkdt.c pmapooc.c
356  
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 –
357   pmapdiag.o: pmapdiag.c pmapdiag.h ../common/platform.h pmapdata.h ray.h \
358   ../common/standard.h ../common/copyright.h ../common/rtio.h \
359   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
# Line 367 | Line 372 | pmapio.o: pmapio.c pmapio.h pmapdata.h ray.h ../common
372   ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
373   ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
374   ../common/rterror.h ../common/octree.h ../common/object.h \
375 < ../common/color.h pmapparm.h pmaptype.h ../common/lookup.h pmapdiag.h \
376 < ../common/platform.h ../common/resolu.h
375 > ../common/color.h pmapparm.h pmaptype.h ../common/paths.h \
376 > ../common/lookup.h pmapkdt.h pmapooc.h pmapdiag.h ../common/platform.h \
377 > ../common/resolu.h
378  
379   pmapmat.o: pmapmat.c pmapmat.h pmap.h pmapparm.h pmaptype.h pmapdata.h \
380   ray.h ../common/standard.h ../common/copyright.h ../common/rtio.h \
# Line 385 | Line 391 | pmapparm.o: pmapparm.c pmapparm.h pmaptype.h pmapdata.
391   ../common/standard.h ../common/copyright.h ../common/rtio.h \
392   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
393   ../common/fvect.h ../common/rterror.h ../common/octree.h \
394 < ../common/object.h ../common/color.h ../common/lookup.h
394 > ../common/object.h ../common/color.h ../common/paths.h \
395 > ../common/lookup.h pmapkdt.h pmapooc.h
396  
397   pmapray.o: pmapray.c pmapray.h ray.h ../common/standard.h \
398   ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
# Line 401 | Line 408 | pmapsrc.o: pmapsrc.c pmapsrc.h ray.h ../common/standar
408   ../common/color.h pmapparm.h pmaptype.h source.h pmap.h pmapdata.h \
409   ../common/lookup.h pmaprand.h ../common/otypes.h
410  
411 + pmutil.o:       pmap.h pmapio.h pmapdata.h pmapparm.h pmaptype.h pmapbias.h \
412 +  ../common/otypes.h
413 +
414   pmaptype.o: pmaptype.c pmaptype.h
415  
416 + mkpmap.o: mkpmap.c pmap.h pmapparm.h pmaptype.h pmapdata.h ray.h \
417 + ../common/standard.h ../common/copyright.h ../common/rtio.h \
418 + ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
419 + ../common/fvect.h ../common/rterror.h ../common/octree.h \
420 + ../common/object.h ../common/color.h ../common/paths.h \
421 + ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmapcontrib.h pmaprand.h \
422 + ambient.h ../common/resolu.h source.h
423 +      
424 + oococt.o: oococt.c oococt.h oocsort.h ooccache.h \
425 + ../common/rtio.h ../common/fvect.h
426 +
427 + ooccache.o: ooccache.c ooccache.h
428 +
429 + oocsort.o: oocsort.c oocsort.h ../common/fvect.h
430 +
431 + oocbuild.o: oocbuild.c oocbuild.h oocsort.h oococt.h
432 +
433 + oocnn.o: oocnn.c oocnn.h oococt.h oocsort.h

Diff Legend

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