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.76 by greg, Wed Sep 2 18:59:01 2015 UTC vs.
Revision 2.98 by greg, Tue Oct 29 00:36:54 2024 UTC

# Line 6 | Line 6
6   OPT = -O
7   MACH = -DBSD
8   CFLAGS = -I../common -L../lib $(OPT) $(MACH)
9 + CXXFLAGS = $(CFLAGS) -std=c++11
10   SPECIAL =
11   CC = cc
12 + CXX = c++
13 + AR = ar
14   MLIB = -lm
15   LINT = lint
16   LINTFLAGS = -DBSD
# Line 31 | Line 34 | LIBDIR = /usr/local/lib/ray
34   RLIB = ../lib/libradiance.a
35   RCLIB = ../lib/libraycalls.a
36   LIBS = -lrtrad $(MLIB)
37 + CXXLIBS = -lcpprad $(LIBS)
38  
39   #
40   # Device drivers for rvu (see also devtable.c):
# Line 57 | Line 61 | RVSRC = rvmain.c rview.c rv2.c rv3.c $(DSRC)
61   RCOBJS = rcmain.o rcontrib.o rc2.o rc3.o
62   RCSRC = rcmain.c rcontrib.c rc2.c rc3.c
63  
64 + RXTOBJS = rxtmain.o rxtrace.o RtraceSimulManager.o
65 + RXTSRC = rxtmain.cpp rxtrace.cpp RtraceSimulManager.cpp
66 +
67 + RXPOBJS = rxpmain.o RpictSimulManager.o RtraceSimulManager.o srcdraw.o
68 + RXPSRC = rxpmain.cpp RpictSimulManager.cpp RtraceSimulManager.cpp srcdraw.c
69 +
70 + RXCOBJS = rxcmain.o RcontribSimulManager.o RtraceSimulManager.o \
71 + RdataShareFile.o RdataShareMap.o
72 + RXCSRC = rxcmain.cpp RcontribSimulManager.cpp RtraceSimulManager.cpp \
73 + RdataShareFile.cpp RdataShareMap.cpp
74 +
75 + RXPCOBJS = rxpiece.o RpictSimulManager.o RtraceSimulManager.o srcdraw.o
76 + RXPCSRC = rxpiece.cpp RpictSimulManager.cpp RtraceSimulManager.cpp srcdraw.c
77 +
78   RLOBJS = raycalls.o raypcalls.o rayfifo.o
79   RLSRC = raycalls.c raypcalls.c rayfifo.c
80  
81   ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
82          $(MODOBJS) $(SUPPOBJS) $(PMOBJS)
83   RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \
84 <        $(MODSRC) $(SUPPSRC) $(PMSRC)
84 >        $(MODSRC) $(SUPPSRC)
85  
86   RAYOBJS = ambcomp.o ambient.o ambio.o freeobjmem.o initotypes.o \
87          preload.o raytrace.o renderopts.o
# Line 85 | Line 103 | MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.
103   MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
104   MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c
105  
106 < SUPPOBJS = func.o noise3.o data.o
107 < SUPPSRC = func.c noise3.c data.c
106 > SUPPOBJS = func.o noise3.o
107 > SUPPSRC = func.c noise3.c
108  
109   PMOBJS = pmap.o pmapsrc.o pmapmat.o pmaprand.o pmapio.o pmapdata.o \
110           pmapbias.o pmapparm.o pmapcontrib.o pmapamb.o pmapray.o pmapopt.o \
111 <         pmapdiag.o pmaptype.o
111 >         pmapdiag.o pmaptype.o oocmorton.o oococt.o oocsort.o oocbuild.o \
112 >         oocnn.o ooccache.o pmutil.o pmcontrib2.o
113   PMSRC = pmap.c pmapsrc.c pmapmat.c pmaprand.c pmapio.c pmapdata.c \
114          pmapbias.c pmapparm.c pmapcontrib.c pmapamb.c pmapray.c pmapopt.c \
115 <        pmapdiag.c pmaptype.c
115 >        pmapdiag.c pmaptype.c pmapkdt.c pmapooc.c oocmorton.c oococt.c \
116 >        oocsort.c oocbuild.c oocnn.c ooccache.c pmutil.c pmcontrib2.c
117  
118 < HEADERS = ambient.h ray.h data.h otspecial.h source.h
118 > HEADERS = ambient.h ray.h otspecial.h source.h
119  
120   #
121   # What this makefile produces:
# Line 108 | Line 128 | all:   $(PROGS) $(RCLIB) $(SPECIAL)
128  
129   install:        all rayinit.cal
130          $(INSTALL) $(PROGS) $(INSTDIR)
111 –        cd $(INSTDIR) ; rm -f rview ; ln -s rvu rview
112 –        cd $(INSTDIR) ; rm -f rtcontrib ; ln -s rcontrib rtcontrib
131          rm -f $(LIBDIR)/rayinit.cal
132          cp rayinit.cal $(LIBDIR)
133  
# Line 138 | Line 156 | $(RLIB) $(LIBS) $(DLIBS)
156   $(DESTDIR)/rcontrib:      $(RCOBJS) $(RLIB)
157          $(CC) $(CFLAGS) -o $(DESTDIR)/rcontrib $(RCOBJS) $(RLIB) $(LIBS)
158  
159 + $(DESTDIR)/rxtrace:     $(RXTOBJS) $(RCLIB) $(RLIB)
160 +        $(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxtrace $(RXTOBJS) $(RCLIB) \
161 + $(RLIB) $(CXXLIBS)
162 +
163 + $(DESTDIR)/rxpict:      $(RXPOBJS) $(RCLIB) $(RLIB)
164 +        $(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxpict $(RXPOBJS) $(RCLIB) \
165 + $(RLIB) $(CXXLIBS)
166 +
167 + $(DESTDIR)/rxcontrib:   $(RXCOBJS) $(RCLIB) $(RLIB)
168 +        $(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxcontrib $(RXCOBJS) $(RCLIB) \
169 + $(RLIB) $(CXXLIBS)
170 +
171 + $(DESTDIR)/rxpiece:     $(RXPCOBJS) $(RCLIB) $(RLIB)
172 +        $(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxpiece $(RXPCOBJS) $(RCLIB) \
173 + $(RLIB) $(CXXLIBS)
174 +
175   $(DESTDIR)/lookamb:     lookamb.o ambio.o
176          $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
177  
# Line 149 | Line 183 | $(DESTDIR)/pmapdump: pmapdump.o pmaptype.o pmapparm.o
183  
184   $(RLIB):        $(ROBJS) Version.o
185          rm -f $(RLIB)
186 <        ar rc $(RLIB) $(ROBJS) Version.o
186 >        $(AR) rc $(RLIB) $(ROBJS) Version.o
187          -ranlib $(RLIB)
188  
189   $(RCLIB):       $(RLOBJS)
190          rm -f $(RCLIB)
191 <        ar rc $(RCLIB) $(RLOBJS)
191 >        $(AR) rc $(RCLIB) $(RLOBJS)
192          -ranlib $(RCLIB)
193  
194   #
# Line 174 | Line 208 | devcomm.o:     devcomm.c
208  
209   Version.c:      VERSION $(RSRC) $(HEADERS)
210          ( cat VERSION ; date ; whoami ; hostname ) > Version.c
211 <        ed - Version.c < verscript.ed
211 >        ed - Version.c < verscript.ed || rm Version.c
212  
213   #
214   # Include dependencies:
215   #
216  
217 < ambio.o colortab.o data.o devcomm.o \
217 > ambio.o colortab.o devcomm.o \
218   devmain.o lookamb.o rview.o x11.o:      ../common/color.h
219  
220   freeobjmem.o o_cone.o srcsupp.o:        ../common/cone.h
221  
222 < data.o freeobjmem.o m_brdf.o mx_data.o \
223 < p_data.o raycalls.o t_data.o:   data.h
222 > freeobjmem.o m_brdf.o mx_data.o \
223 > p_data.o raycalls.o t_data.o:   ../common/data.h
224  
225   devcomm.o devmain.o devtable.o \
226   editline.o x11.o:       driver.h
# Line 199 | Line 233 | rtrace.o rvmain.o rv2.o rv3.o: ../common/octree.h
233   o_instance.o:   ../common/instance.h
234  
235   ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o glass.o \
236 < initotypes.o m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o preload.o \
237 < raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \
238 < srcdraw.o srcobstr.o virtuals.o:        ../common/otypes.h
236 > initotypes.o m_brdf.o m_bsdf.o m_direct.o m_mirror.o normal.o o_cone.o \
237 > preload.o raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o \
238 > srcsupp.o text.o srcdraw.o srcobstr.o virtuals.o:       ../common/otypes.h
239  
240 < ambient.o ambcomp.o aniso.o ashikhmin.o normal.o raycalls.o raytrace.o \
241 < rpict.o rvmain.o rtmain.o rpmain.o rcmain.o persist.o source.o rv3.o \
240 > ambient.o ambcomp.o aniso.o ashikhmin.o normal.o p_func.o raycalls.o raytrace.o \
241 > rpict.o rvmain.o rtmain.o rpmain.o rcmain.o rxpiece.o persist.o source.o rv3.o \
242   srcsamp.o virtuals.o:   ../common/random.h
243  
244   ambcomp.o ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o \
# Line 213 | Line 247 | o_mesh.o mx_func.o normal.o o_cone.o o_face.o o_instan
247   raycalls.o raypcalls.o rayfifo.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
248   source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \
249   text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o rcmain.o \
250 < rcontrib.o rc2.o rc3.o: ray.h \
250 > rcontrib.o rc2.o rc3.o RtraceSimulManager.o RpictSimulManager.o \
251 > rxtrace.o rxtmain.o rxpiece.o rxpmain.o rxcmain.o \
252 > RcontribSimulManager.o RpictSimulManager.o RtraceSimulManager.o:        ray.h \
253   ../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \
254   ../common/rterror.h ../common/octree.h \
255   ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
# Line 221 | Line 257 | rcontrib.o rc2.o rc3.o:        ray.h \
257   rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h ../common/resolu.h
258  
259   m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o \
260 < rpict.o rpmain.o rtmain.o rvmain.o rv2.o source.o srcdraw.o \
260 > rpict.o rpmain.o rtmain.o rvmain.o source.o srcdraw.o \
261   srcobstr.o srcsamp.o srcsupp.o virtuals.o:      source.h
262  
263 < cone.o data.o devcomm.o initotypes.o fprism.o preload.o \
263 > cone.o devcomm.o initotypes.o fprism.o preload.o \
264   duphead.o octree.o:     ../common/standard.h ../common/rtmisc.h \
265   ../common/rtio.h ../common/rtmath.h \
266   ../common/rterror.h ../common/mat4.h ../common/fvect.h
267  
268   ambio.o:        ../common/fvect.h
269  
270 < initotypes.o srcobstr.o raytrace.o:     otspecial.h
270 > ambient.o initotypes.o m_alias.o pmapcontrib.o pmapkdt.o \
271 > pmapooc.o pmapsrc.o pmcontrib2.o \
272 > raytrace.o rtrace.o rv2.o rv3.o source.o \
273 > srcdraw.o srcobstr.o virtuals.o:        otspecial.h
274  
275   rpmain.o rtmain.o rvmain.o rpict.o \
276   srcdraw.o:      ../common/view.h ../common/resolu.h
# Line 244 | Line 283 | x11.o: x11icon.h
283  
284   ambient.o ambcomp.o ambio.o lookamb.o raycalls.o:       ambient.h
285  
286 < data.o rpmain.o rtmain.o rvmain.o rpict.o rtrace.o \
286 > rpmain.o rtmain.o rvmain.o rpict.o rtrace.o \
287   rv2.o:  ../common/resolu.h
288  
289   aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o p_data.o \
290   p_func.o t_data.o t_func.o:     func.h ../common/calcomp.h
291  
292 < preload.o:      data.h func.h ../common/object.h ../common/face.h \
292 > preload.o:      func.h ../common/data.h ../common/object.h ../common/face.h \
293   ../common/cone.h ../common/instance.h ../common/mesh.h \
294   ../common/color.h ../common/bsdf.h ../common/otypes.h
295  
# Line 278 | Line 317 | rcmain.o rcontrib.o rc2.o rc3.o:       rcontrib.h \
317   ../common/platform.h ../common/paths.h ../common/lookup.h \
318   func.h ../common/calcomp.h ../common/rtprocess.h
319  
320 < rcmain.o:       source.h ambient.h
320 > ambient.o rcmain.o:     ambient.h
321  
322 + rcmain.o:       source.h
323 +
324   rcontrib.o:     source.h ../common/otypes.h
325  
326   rc2.o:  ../common/resolu.h
# Line 289 | Line 330 | rc3.o: ../common/selcall.h
330   #
331   # Photon map include dependencies (via 'gcc -MM -I../common')
332   #
292 –
293 –
333   ambient.o: pmapparm.h pmaptype.h pmapamb.h pmapdata.h
334  
335 < aniso.o ashikhmin.o dielectric.o glass.o m_brdf.o m_bsdf.o normal.o: \
335 > dielectric.o glass.o normal.o m_brdf.o m_bsdf.o ashikhmin.o aniso.o: \
336     pmapparm.h pmaptype.h pmapmat.h pmap.h pmapdata.h
337    
338   raycalls.o rpmain.o rcmain.o rtmain.o rvmain.o: \
# Line 326 | Line 365 | pmap.o: pmap.c pmap.h pmapparm.h pmaptype.h pmapdata.h
365   ../common/standard.h ../common/copyright.h ../common/rtio.h \
366   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
367   ../common/fvect.h ../common/rterror.h ../common/octree.h \
368 < ../common/object.h ../common/color.h ../common/lookup.h pmapmat.h \
369 < pmapsrc.h source.h pmaprand.h pmapio.h pmapbias.h pmapdiag.h \
370 < ../common/platform.h ../common/otypes.h
368 > ../common/object.h ../common/color.h ../common/paths.h \
369 > ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmapsrc.h source.h pmaprand.h \
370 > pmapio.h pmapbias.h pmapdiag.h ../common/platform.h ../common/otypes.h
371  
372   pmapcontrib.o: pmapcontrib.c pmapcontrib.h pmapdata.h ray.h \
373   ../common/standard.h ../common/copyright.h ../common/rtio.h \
374   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
375   ../common/fvect.h ../common/rterror.h ../common/octree.h \
376   ../common/object.h ../common/color.h pmapparm.h pmaptype.h \
377 < ../common/lookup.h pmap.h pmapmat.h pmapsrc.h source.h pmaprand.h \
378 < pmapio.h pmapdiag.h ../common/platform.h rcontrib.h ../common/paths.h \
377 > ../common/paths.h ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmap.h \
378 > pmapsrc.h source.h pmaprand.h pmapio.h pmapdiag.h ../common/platform.h \
379 > rcontrib.h ../common/rtprocess.h ../common/paths.h func.h \
380 > ../common/calcomp.h ../common/otypes.h
381 >
382 > pmapdata.o: pmapdata.c pmapdata.h ray.h ../common/standard.h \
383 > ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
384 > ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
385 > ../common/rterror.h ../common/octree.h ../common/object.h \
386 > ../common/color.h pmapparm.h pmaptype.h ../common/paths.h \
387 > ../common/lookup.h pmapkdt.h pmapooc.h pmaprand.h pmapmat.h pmap.h \
388 > ../common/otypes.h source.h rcontrib.h ../common/platform.h \
389   ../common/rtprocess.h ../common/paths.h func.h ../common/calcomp.h \
390 < ../common/otypes.h
390 > ../common/random.h pmapkdt.c pmapooc.c
391  
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 –
392   pmapdiag.o: pmapdiag.c pmapdiag.h ../common/platform.h pmapdata.h ray.h \
393   ../common/standard.h ../common/copyright.h ../common/rtio.h \
394   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
# Line 367 | Line 407 | pmapio.o: pmapio.c pmapio.h pmapdata.h ray.h ../common
407   ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
408   ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
409   ../common/rterror.h ../common/octree.h ../common/object.h \
410 < ../common/color.h pmapparm.h pmaptype.h ../common/lookup.h pmapdiag.h \
411 < ../common/platform.h ../common/resolu.h
410 > ../common/color.h pmapparm.h pmaptype.h ../common/paths.h \
411 > ../common/lookup.h pmapkdt.h pmapooc.h pmapdiag.h ../common/platform.h \
412 > ../common/resolu.h
413  
414   pmapmat.o: pmapmat.c pmapmat.h pmap.h pmapparm.h pmaptype.h pmapdata.h \
415   ray.h ../common/standard.h ../common/copyright.h ../common/rtio.h \
416   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
417   ../common/fvect.h ../common/rterror.h ../common/octree.h \
418   ../common/object.h ../common/color.h ../common/lookup.h pmaprand.h \
419 < ../common/otypes.h data.h func.h ../common/calcomp.h ../common/bsdf.h \
420 < ../common/ccolor.h
419 > ../common/otypes.h ../common/data.h func.h ../common/calcomp.h \
420 > ../common/bsdf.h ../common/ccolor.h
421  
422   pmapopt.o: pmapopt.c pmapparm.h pmaptype.h ../common/rtio.h \
423   ../common/rterror.h
# Line 385 | Line 426 | pmapparm.o: pmapparm.c pmapparm.h pmaptype.h pmapdata.
426   ../common/standard.h ../common/copyright.h ../common/rtio.h \
427   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
428   ../common/fvect.h ../common/rterror.h ../common/octree.h \
429 < ../common/object.h ../common/color.h ../common/lookup.h
429 > ../common/object.h ../common/color.h ../common/paths.h \
430 > ../common/lookup.h pmapkdt.h pmapooc.h
431  
432   pmapray.o: pmapray.c pmapray.h ray.h ../common/standard.h \
433   ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
# Line 401 | Line 443 | pmapsrc.o: pmapsrc.c pmapsrc.h ray.h ../common/standar
443   ../common/color.h pmapparm.h pmaptype.h source.h pmap.h pmapdata.h \
444   ../common/lookup.h pmaprand.h ../common/otypes.h
445  
446 + pmutil.o:       pmap.h pmapio.h pmapdata.h pmapparm.h pmaptype.h pmapbias.h \
447 +  ../common/otypes.h
448 +
449   pmaptype.o: pmaptype.c pmaptype.h
450  
451 + mkpmap.o: mkpmap.c pmap.h pmapparm.h pmaptype.h pmapdata.h ray.h \
452 + ../common/standard.h ../common/copyright.h ../common/rtio.h \
453 + ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
454 + ../common/fvect.h ../common/rterror.h ../common/octree.h \
455 + ../common/object.h ../common/color.h ../common/paths.h \
456 + ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmapcontrib.h pmaprand.h \
457 + ambient.h ../common/resolu.h source.h
458 +      
459 + oococt.o: oococt.c oococt.h oocsort.h ooccache.h \
460 + ../common/rtio.h ../common/fvect.h
461 +
462 + ooccache.o: ooccache.c ooccache.h
463 +
464 + oocsort.o: oocsort.c oocsort.h ../common/fvect.h
465 +
466 + oocbuild.o: oocbuild.c oocbuild.h oocsort.h oococt.h
467 +
468 + oocnn.o: oocnn.c oocnn.h oococt.h oocsort.h
469 +
470 + rxtrace.o rxtmain.o rxpiece.o rxpmain.o rxcmain.o \
471 + RcontribSimulManager.o RpictSimulManager.o \
472 + RtraceSimulManager.o:   RtraceSimulManager.h \
473 + ../common/abitmap.h
474 +
475 + RpictSimulManager.o rxpiece.o rxpmain.o:        RpictSimulManager.h \
476 + ../common/view.h ../common/depthcodec.h ../common/abitmap.h
477 +
478 + rxcmain.o RcontribSimulManager.o:       RcontribSimulManager.h RdataShare.h \
479 + ../common/lookup.h ../common/rtprocess.h
480 +
481 + RdataShareFile.o RdataShareMap.o:       RdataShare.h \
482 + ../common/rtio.h ../common/rterror.h
483 +
484 + RcontribSimulManager.o: source.h func.h \
485 + ../common/selcall.h ../common/calcomp.h \
486 + ../common/resolu.h ../common/platform.h
487 +
488 + rxcmain.o:      func.h ../common/calcomp.h ../common/platform.h
489 +
490 + RpictSimulManager.o:    ../common/random.h

Diff Legend

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