ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/src/rt/Rmakefile
(Generate patch)

Comparing src/rt/Rmakefile (file contents):
Revision 2.92 by greg, Wed Nov 15 18:02:52 2023 UTC vs.
Revision 2.104 by greg, Wed Oct 22 02:38:27 2025 UTC

# Line 34 | 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 60 | 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 < RATOBJS = rxtmain.o rxtrace.o RtraceSimulManager.o
65 < RATSRC = rxtmain.cpp rxtrace.cpp RtraceSimulManager.cpp
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 + RXFMOBJS = rxfluxmtx.o RcontribSimulManager.o RtraceSimulManager.o \
79 + RdataShareFile.o RdataShareMap.o
80 + RXFMSRC = rxfluxmtx.cpp RcontribSimulManager.cpp RtraceSimulManager.cpp \
81 + RdataShareFile.cpp RdataShareMap.cpp
82 +
83   RLOBJS = raycalls.o raypcalls.o rayfifo.o
84   RLSRC = raycalls.c raypcalls.c rayfifo.c
85  
# Line 83 | Line 100 | SURFSRC = sphere.c source.c srcobstr.c srcsupp.c srcsa
100  
101   MATOBJS = aniso.o normal.o dielectric.o m_clip.o glass.o m_brdf.o \
102          m_mirror.o m_direct.o m_mist.o fprism.o m_alias.o m_bsdf.o \
103 <        ashikhmin.o
103 >        m_wgmdf.o ashikhmin.o
104   MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.c m_brdf.c \
105          m_mirror.c m_direct.c m_mist.c fprism.c m_alias.c m_bsdf.c \
106 <        ashikhmin.c
106 >        m_wgmdf.c ashikhmin.c
107  
108   MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
109   MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c
110  
111 < SUPPOBJS = func.o noise3.o data.o
112 < SUPPSRC = func.c noise3.c data.c
111 > SUPPOBJS = func.o noise3.o
112 > SUPPSRC = func.c noise3.c
113  
114   PMOBJS = pmap.o pmapsrc.o pmapmat.o pmaprand.o pmapio.o pmapdata.o \
115           pmapbias.o pmapparm.o pmapcontrib.o pmapamb.o pmapray.o pmapopt.o \
# Line 103 | Line 120 | PMSRC = pmap.c pmapsrc.c pmapmat.c pmaprand.c pmapio.c
120          pmapdiag.c pmaptype.c pmapkdt.c pmapooc.c oocmorton.c oococt.c \
121          oocsort.c oocbuild.c oocnn.c ooccache.c pmutil.c pmcontrib2.c
122  
123 < HEADERS = ambient.h ray.h data.h otspecial.h source.h
123 > HEADERS = ambient.h ray.h otspecial.h source.h
124  
125   #
126   # What this makefile produces:
127   #
128  
129   PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/rcontrib \
130 < $(DESTDIR)/lookamb $(DESTDIR)/mkpmap $(DESTDIR)/pmapdump
130 > $(DESTDIR)/lookamb $(DESTDIR)/mkpmap $(DESTDIR)/pmapdump \
131 > $(DESTDIR)/rxpiece
132  
133   all:    $(PROGS) $(RCLIB) $(SPECIAL)
134  
# Line 144 | Line 162 | $(RLIB) $(LIBS) $(DLIBS)
162   $(DESTDIR)/rcontrib:      $(RCOBJS) $(RLIB)
163          $(CC) $(CFLAGS) -o $(DESTDIR)/rcontrib $(RCOBJS) $(RLIB) $(LIBS)
164  
165 < $(DESTDIR)/rxtrace:     $(RATOBJS) $(RCLIB) $(RLIB)
166 <        $(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxtrace $(RATOBJS) $(RCLIB) \
167 < $(RLIB) $(LIBS)
165 > $(DESTDIR)/rxtrace:     $(RXTOBJS) $(RCLIB) $(RLIB)
166 >        $(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxtrace $(RXTOBJS) $(RCLIB) \
167 > $(RLIB) $(CXXLIBS)
168  
169 + $(DESTDIR)/rxpict:      $(RXPOBJS) $(RCLIB) $(RLIB)
170 +        $(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxpict $(RXPOBJS) $(RCLIB) \
171 + $(RLIB) $(CXXLIBS)
172 +
173 + $(DESTDIR)/rxcontrib:   $(RXCOBJS) $(RCLIB) $(RLIB)
174 +        $(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxcontrib $(RXCOBJS) $(RCLIB) \
175 + $(RLIB) $(CXXLIBS)
176 +
177 + $(DESTDIR)/rxpiece:     $(RXPCOBJS) $(RCLIB) $(RLIB)
178 +        $(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxpiece $(RXPCOBJS) $(RCLIB) \
179 + $(RLIB) $(CXXLIBS)
180 +
181 + $(DESTDIR)/rxfluxmtx:   $(RXFMOBJS) $(RCLIB) $(RLIB)
182 +        $(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxfluxmtx $(RXFMOBJS) $(RCLIB) \
183 + $(RLIB) $(CXXLIBS)
184 +
185 +
186   $(DESTDIR)/lookamb:     lookamb.o ambio.o
187          $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
188  
# Line 190 | Line 225 | Version.c:     VERSION $(RSRC) $(HEADERS)
225   # Include dependencies:
226   #
227  
228 < ambio.o colortab.o data.o devcomm.o \
228 > ambio.o colortab.o devcomm.o \
229   devmain.o lookamb.o rview.o x11.o:      ../common/color.h
230  
231   freeobjmem.o o_cone.o srcsupp.o:        ../common/cone.h
232  
233 < data.o freeobjmem.o m_brdf.o mx_data.o \
234 < p_data.o raycalls.o t_data.o:   data.h
233 > freeobjmem.o m_brdf.o mx_data.o \
234 > p_data.o raycalls.o t_data.o:   ../common/data.h
235  
236   devcomm.o devmain.o devtable.o \
237   editline.o x11.o:       driver.h
# Line 209 | Line 244 | rtrace.o rvmain.o rv2.o rv3.o: ../common/octree.h
244   o_instance.o:   ../common/instance.h
245  
246   ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o glass.o \
247 < initotypes.o m_brdf.o m_bsdf.o m_direct.o m_mirror.o normal.o o_cone.o \
248 < preload.o raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o \
249 < srcsupp.o text.o srcdraw.o srcobstr.o virtuals.o:       ../common/otypes.h
247 > initotypes.o m_brdf.o m_bsdf.o m_wgmdf.o m_direct.o m_mirror.o normal.o \
248 > o_cone.o preload.o raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o \
249 > m_wgmdf.o srcsupp.o text.o srcdraw.o srcobstr.o \
250 > virtuals.o:     ../common/otypes.h
251  
252 < ambient.o ambcomp.o aniso.o ashikhmin.o normal.o raycalls.o raytrace.o \
253 < rpict.o rvmain.o rtmain.o rpmain.o rcmain.o persist.o source.o rv3.o \
254 < srcsamp.o virtuals.o:   ../common/random.h
252 > ambient.o ambcomp.o aniso.o ashikhmin.o normal.o p_func.o raycalls.o raytrace.o \
253 > rpict.o rvmain.o rtmain.o rpmain.o rcmain.o rxpiece.o persist.o source.o rv3.o \
254 > srcsamp.o virtuals.o m_wgmdf.o: ../common/random.h
255  
256   ambcomp.o ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o \
257   glass.o m_bsdf.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o \
# Line 223 | Line 259 | o_mesh.o mx_func.o normal.o o_cone.o o_face.o o_instan
259   raycalls.o raypcalls.o rayfifo.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
260   source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \
261   text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o rcmain.o \
262 < rcontrib.o rc2.o rc3.o: ray.h \
262 > rcontrib.o rc2.o rc3.o RtraceSimulManager.o RpictSimulManager.o \
263 > rxtrace.o rxtmain.o rxpiece.o rxpmain.o rxcmain.o m_wgmdf.o rxfluxmtx.o \
264 > RcontribSimulManager.o RpictSimulManager.o RtraceSimulManager.o:        ray.h \
265   ../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \
266   ../common/rterror.h ../common/octree.h \
267   ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
268  
269   rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h ../common/resolu.h
270  
271 < m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o \
271 > m_direct.o m_mirror.o m_mist.o raycalls.o \
272   rpict.o rpmain.o rtmain.o rvmain.o source.o srcdraw.o \
273   srcobstr.o srcsamp.o srcsupp.o virtuals.o:      source.h
274  
275 < cone.o data.o devcomm.o initotypes.o fprism.o preload.o \
275 > cone.o devcomm.o initotypes.o fprism.o preload.o \
276   duphead.o octree.o:     ../common/standard.h ../common/rtmisc.h \
277   ../common/rtio.h ../common/rtmath.h \
278   ../common/rterror.h ../common/mat4.h ../common/fvect.h
# Line 242 | Line 280 | duphead.o octree.o:    ../common/standard.h ../common/rtm
280   ambio.o:        ../common/fvect.h
281  
282   ambient.o initotypes.o m_alias.o pmapcontrib.o pmapkdt.o \
283 < pmapooc.o pmapsrc.o pmcontrib2.o \
283 > pmapooc.o pmapsrc.o pmcontrib2.o m_mirror.o \
284   raytrace.o rtrace.o rv2.o rv3.o source.o \
285   srcdraw.o srcobstr.o virtuals.o:        otspecial.h
286  
287 < rpmain.o rtmain.o rvmain.o rpict.o \
287 > rpmain.o rtmain.o rvmain.o rpict.o rxfluxmtx.o \
288   srcdraw.o:      ../common/view.h ../common/resolu.h
289  
290   rpict.o:        ../common/hilbert.h
# Line 257 | Line 295 | x11.o: x11icon.h
295  
296   ambient.o ambcomp.o ambio.o lookamb.o raycalls.o:       ambient.h
297  
298 < data.o rpmain.o rtmain.o rvmain.o rpict.o rtrace.o \
298 > rpmain.o rtmain.o rvmain.o rpict.o rtrace.o \
299   rv2.o:  ../common/resolu.h
300  
301   aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o p_data.o \
302   p_func.o t_data.o t_func.o:     func.h ../common/calcomp.h
303  
304 < preload.o:      data.h func.h ../common/object.h ../common/face.h \
304 > preload.o:      func.h ../common/data.h ../common/object.h ../common/face.h \
305   ../common/cone.h ../common/instance.h ../common/mesh.h \
306   ../common/color.h ../common/bsdf.h ../common/otypes.h
307  
# Line 282 | Line 320 | aniso.o ashikhmin.o dielectric.o freeobjmem.o glass.o
320   m_alias.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o \
321   mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
322   o_mesh.o p_data.o p_func.o source.o sphere.o t_data.o t_func.o \
323 < srcobstr.o text.o:              rtotypes.h
323 > m_wgmdf.o srcobstr.o text.o:            rtotypes.h
324  
325 + aniso.o ashikhmin.o dielectric.o glass.o m_brdf.o \
326 + m_direct.o m_mirror.o m_mist.o normal.o m_wgmdf.o \
327 + srcobstr.o:     source.h
328 +
329   m_bsdf.o:       ambient.h source.h func.h \
330   ../common/calcomp.h ../common/bsdf.h ../common/random.h
331  
332 + rxfluxmtx.o:    func.h ../common/bsdf.h ../common/bsdf_m.h \
333 + ../common/random.h ../common/triangulate.h
334 +
335   rcmain.o rcontrib.o rc2.o rc3.o:        rcontrib.h \
336   ../common/platform.h ../common/paths.h ../common/lookup.h \
337   func.h ../common/calcomp.h ../common/rtprocess.h
338  
339   ambient.o rcmain.o:     ambient.h
340  
341 < rcmain.o:       source.h
341 > rcmain.o rpmain.o rtmain.o rvmain.o rtrace.o \
342 > rcontrib.o source.o srcdraw.o srcobstr.o \
343 > srcsamp.o srcsupp.o virtuals.o: source.h
344  
345 < rcontrib.o:     source.h ../common/otypes.h
345 > rcontrib.o:     ../common/otypes.h
346  
347   rc2.o:  ../common/resolu.h
348  
# Line 306 | Line 353 | rc3.o: ../common/selcall.h
353   #
354   ambient.o: pmapparm.h pmaptype.h pmapamb.h pmapdata.h
355  
356 < dielectric.o glass.o normal.o m_brdf.o m_bsdf.o ashikhmin.o aniso.o: \
357 <   pmapparm.h pmaptype.h pmapmat.h pmap.h pmapdata.h
356 > dielectric.o glass.o normal.o m_brdf.o m_bsdf.o \
357 > m_wgmdf.o ashikhmin.o aniso.o:  pmapparm.h pmaptype.h \
358 > pmapmat.h pmap.h pmapdata.h
359    
360   raycalls.o rpmain.o rcmain.o rtmain.o rvmain.o: \
361     pmapparm.h pmaptype.h pmapray.h
# Line 390 | Line 438 | pmapmat.o: pmapmat.c pmapmat.h pmap.h pmapparm.h pmapt
438   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
439   ../common/fvect.h ../common/rterror.h ../common/octree.h \
440   ../common/object.h ../common/color.h ../common/lookup.h pmaprand.h \
441 < ../common/otypes.h data.h func.h ../common/calcomp.h ../common/bsdf.h \
442 < ../common/ccolor.h
441 > ../common/otypes.h ../common/data.h func.h ../common/calcomp.h \
442 > ../common/bsdf.h ../common/ccolor.h
443  
444   pmapopt.o: pmapopt.c pmapparm.h pmaptype.h ../common/rtio.h \
445   ../common/rterror.h
# Line 441 | Line 489 | oocbuild.o: oocbuild.c oocbuild.h oocsort.h oococt.h
489  
490   oocnn.o: oocnn.c oocnn.h oococt.h oocsort.h
491  
492 < RtraceSimulManager.o rxtrace.o: RtraceSimulManager.h
492 > rxtrace.o rxtmain.o rxpiece.o rxpmain.o rxcmain.o rxfluxmtx.o \
493 > RcontribSimulManager.o RpictSimulManager.o \
494 > RtraceSimulManager.o:   RtraceSimulManager.h \
495 > ../common/abitmap.h
496 >
497 > RpictSimulManager.o rxpiece.o rxpmain.o:        RpictSimulManager.h \
498 > ../common/view.h ../common/depthcodec.h ../common/abitmap.h
499 >
500 > rxcmain.o RcontribSimulManager.o rxfluxmtx.o:   RcontribSimulManager.h RdataShare.h \
501 > ../common/lookup.h ../common/rtprocess.h
502 >
503 > RdataShareFile.o RdataShareMap.o:       RdataShare.h \
504 > ../common/rtio.h ../common/rterror.h
505 >
506 > RcontribSimulManager.o: source.h func.h \
507 > ../common/selcall.h ../common/calcomp.h \
508 > ../common/resolu.h ../common/platform.h
509 >
510 > rxcmain.o:      func.h ../common/calcomp.h ../common/platform.h
511 >
512 > RpictSimulManager.o:    ../common/random.h

Diff Legend

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