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.88 by greg, Wed Feb 8 17:41:48 2023 UTC vs.
Revision 2.103 by greg, Wed Jun 4 20:32:25 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 = ratmain.o ratrace.o RtraceSimulManager.o
65 < RATSRC = ratmain.cpp ratrace.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   RLOBJS = raycalls.o raypcalls.o rayfifo.o
79   RLSRC = raycalls.c raypcalls.c rayfifo.c
80  
# Line 83 | Line 95 | SURFSRC = sphere.c source.c srcobstr.c srcsupp.c srcsa
95  
96   MATOBJS = aniso.o normal.o dielectric.o m_clip.o glass.o m_brdf.o \
97          m_mirror.o m_direct.o m_mist.o fprism.o m_alias.o m_bsdf.o \
98 <        ashikhmin.o
98 >        m_wgmdf.o ashikhmin.o
99   MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.c m_brdf.c \
100          m_mirror.c m_direct.c m_mist.c fprism.c m_alias.c m_bsdf.c \
101 <        ashikhmin.c
101 >        m_wgmdf.c ashikhmin.c
102  
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 \
# Line 103 | Line 115 | PMSRC = pmap.c pmapsrc.c pmapmat.c pmaprand.c pmapio.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:
122   #
123  
124   PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/rcontrib \
125 < $(DESTDIR)/ratrace $(DESTDIR)/lookamb $(DESTDIR)/mkpmap $(DESTDIR)/pmapdump
125 > $(DESTDIR)/lookamb $(DESTDIR)/mkpmap $(DESTDIR)/pmapdump \
126 > $(DESTDIR)/rxpiece
127  
128   all:    $(PROGS) $(RCLIB) $(SPECIAL)
129  
# Line 144 | Line 157 | $(RLIB) $(LIBS) $(DLIBS)
157   $(DESTDIR)/rcontrib:      $(RCOBJS) $(RLIB)
158          $(CC) $(CFLAGS) -o $(DESTDIR)/rcontrib $(RCOBJS) $(RLIB) $(LIBS)
159  
160 < $(DESTDIR)/ratrace:     $(RATOBJS) $(RCLIB) $(RLIB)
161 <        $(CXX) $(CXXFLAGS) -o $(DESTDIR)/ratrace $(RATOBJS) $(RCLIB) \
162 < $(RLIB) $(LIBS)
160 > $(DESTDIR)/rxtrace:     $(RXTOBJS) $(RCLIB) $(RLIB)
161 >        $(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxtrace $(RXTOBJS) $(RCLIB) \
162 > $(RLIB) $(CXXLIBS)
163  
164 + $(DESTDIR)/rxpict:      $(RXPOBJS) $(RCLIB) $(RLIB)
165 +        $(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxpict $(RXPOBJS) $(RCLIB) \
166 + $(RLIB) $(CXXLIBS)
167 +
168 + $(DESTDIR)/rxcontrib:   $(RXCOBJS) $(RCLIB) $(RLIB)
169 +        $(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxcontrib $(RXCOBJS) $(RCLIB) \
170 + $(RLIB) $(CXXLIBS)
171 +
172 + $(DESTDIR)/rxpiece:     $(RXPCOBJS) $(RCLIB) $(RLIB)
173 +        $(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxpiece $(RXPCOBJS) $(RCLIB) \
174 + $(RLIB) $(CXXLIBS)
175 +
176   $(DESTDIR)/lookamb:     lookamb.o ambio.o
177          $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
178  
# Line 190 | Line 215 | Version.c:     VERSION $(RSRC) $(HEADERS)
215   # Include dependencies:
216   #
217  
218 < ambio.o colortab.o data.o devcomm.o \
218 > ambio.o colortab.o devcomm.o \
219   devmain.o lookamb.o rview.o x11.o:      ../common/color.h
220  
221   freeobjmem.o o_cone.o srcsupp.o:        ../common/cone.h
222  
223 < data.o freeobjmem.o m_brdf.o mx_data.o \
224 < p_data.o raycalls.o t_data.o:   data.h
223 > freeobjmem.o m_brdf.o mx_data.o \
224 > p_data.o raycalls.o t_data.o:   ../common/data.h
225  
226   devcomm.o devmain.o devtable.o \
227   editline.o x11.o:       driver.h
# Line 209 | Line 234 | rtrace.o rvmain.o rv2.o rv3.o: ../common/octree.h
234   o_instance.o:   ../common/instance.h
235  
236   ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o glass.o \
237 < initotypes.o m_brdf.o m_bsdf.o m_direct.o m_mirror.o normal.o o_cone.o \
238 < preload.o raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o \
239 < srcsupp.o text.o srcdraw.o srcobstr.o virtuals.o:       ../common/otypes.h
237 > initotypes.o m_brdf.o m_bsdf.o m_wgmdf.o m_direct.o m_mirror.o normal.o \
238 > o_cone.o preload.o raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o \
239 > m_wgmdf.o srcsupp.o text.o srcdraw.o srcobstr.o \
240 > virtuals.o:     ../common/otypes.h
241  
242 < ambient.o ambcomp.o aniso.o ashikhmin.o normal.o raycalls.o raytrace.o \
243 < rpict.o rvmain.o rtmain.o rpmain.o rcmain.o persist.o source.o rv3.o \
244 < srcsamp.o virtuals.o:   ../common/random.h
242 > ambient.o ambcomp.o aniso.o ashikhmin.o normal.o p_func.o raycalls.o raytrace.o \
243 > rpict.o rvmain.o rtmain.o rpmain.o rcmain.o rxpiece.o persist.o source.o rv3.o \
244 > srcsamp.o virtuals.o m_wgmdf.o: ../common/random.h
245  
246   ambcomp.o ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o \
247   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 249 | o_mesh.o mx_func.o normal.o o_cone.o o_face.o o_instan
249   raycalls.o raypcalls.o rayfifo.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
250   source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \
251   text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o rcmain.o \
252 < rcontrib.o rc2.o rc3.o: ray.h \
252 > rcontrib.o rc2.o rc3.o RtraceSimulManager.o RpictSimulManager.o \
253 > rxtrace.o rxtmain.o rxpiece.o rxpmain.o rxcmain.o m_wgmdf.o \
254 > RcontribSimulManager.o RpictSimulManager.o RtraceSimulManager.o:        ray.h \
255   ../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \
256   ../common/rterror.h ../common/octree.h \
257   ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
258  
259   rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h ../common/resolu.h
260  
261 < m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o \
261 > m_direct.o m_mirror.o m_mist.o raycalls.o \
262   rpict.o rpmain.o rtmain.o rvmain.o source.o srcdraw.o \
263   srcobstr.o srcsamp.o srcsupp.o virtuals.o:      source.h
264  
265 < cone.o data.o devcomm.o initotypes.o fprism.o preload.o \
265 > cone.o devcomm.o initotypes.o fprism.o preload.o \
266   duphead.o octree.o:     ../common/standard.h ../common/rtmisc.h \
267   ../common/rtio.h ../common/rtmath.h \
268   ../common/rterror.h ../common/mat4.h ../common/fvect.h
# Line 242 | Line 270 | duphead.o octree.o:    ../common/standard.h ../common/rtm
270   ambio.o:        ../common/fvect.h
271  
272   ambient.o initotypes.o m_alias.o pmapcontrib.o pmapkdt.o \
273 < pmapooc.o pmapsrc.o pmcontrib2.o \
273 > pmapooc.o pmapsrc.o pmcontrib2.o m_mirror.o \
274   raytrace.o rtrace.o rv2.o rv3.o source.o \
275   srcdraw.o srcobstr.o virtuals.o:        otspecial.h
276  
# Line 257 | Line 285 | x11.o: x11icon.h
285  
286   ambient.o ambcomp.o ambio.o lookamb.o raycalls.o:       ambient.h
287  
288 < data.o rpmain.o rtmain.o rvmain.o rpict.o rtrace.o \
288 > rpmain.o rtmain.o rvmain.o rpict.o rtrace.o \
289   rv2.o:  ../common/resolu.h
290  
291   aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o p_data.o \
292   p_func.o t_data.o t_func.o:     func.h ../common/calcomp.h
293  
294 < preload.o:      data.h func.h ../common/object.h ../common/face.h \
294 > preload.o:      func.h ../common/data.h ../common/object.h ../common/face.h \
295   ../common/cone.h ../common/instance.h ../common/mesh.h \
296   ../common/color.h ../common/bsdf.h ../common/otypes.h
297  
# Line 282 | Line 310 | aniso.o ashikhmin.o dielectric.o freeobjmem.o glass.o
310   m_alias.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o \
311   mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
312   o_mesh.o p_data.o p_func.o source.o sphere.o t_data.o t_func.o \
313 < srcobstr.o text.o:              rtotypes.h
313 > m_wgmdf.o srcobstr.o text.o:            rtotypes.h
314  
315 + aniso.o ashikhmin.o dielectric.o glass.o m_brdf.o \
316 + m_direct.o m_mirror.o m_mist.o normal.o m_wgmdf.o \
317 + srcobstr.o:     source.h
318 +
319   m_bsdf.o:       ambient.h source.h func.h \
320   ../common/calcomp.h ../common/bsdf.h ../common/random.h
321  
# Line 293 | Line 325 | func.h ../common/calcomp.h ../common/rtprocess.h
325  
326   ambient.o rcmain.o:     ambient.h
327  
328 < rcmain.o:       source.h
328 > rcmain.o rpmain.o rtmain.o rvmain.o rtrace.o \
329 > rcontrib.o source.o srcdraw.o srcobstr.o \
330 > srcsamp.o srcsupp.o virtuals.o: source.h
331  
332 < rcontrib.o:     source.h ../common/otypes.h
332 > rcontrib.o:     ../common/otypes.h
333  
334   rc2.o:  ../common/resolu.h
335  
# Line 306 | Line 340 | rc3.o: ../common/selcall.h
340   #
341   ambient.o: pmapparm.h pmaptype.h pmapamb.h pmapdata.h
342  
343 < dielectric.o glass.o normal.o m_brdf.o m_bsdf.o ashikhmin.o aniso.o: \
344 <   pmapparm.h pmaptype.h pmapmat.h pmap.h pmapdata.h
343 > dielectric.o glass.o normal.o m_brdf.o m_bsdf.o \
344 > m_wgmdf.o ashikhmin.o aniso.o:  pmapparm.h pmaptype.h \
345 > pmapmat.h pmap.h pmapdata.h
346    
347   raycalls.o rpmain.o rcmain.o rtmain.o rvmain.o: \
348     pmapparm.h pmaptype.h pmapray.h
# Line 390 | Line 425 | pmapmat.o: pmapmat.c pmapmat.h pmap.h pmapparm.h pmapt
425   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
426   ../common/fvect.h ../common/rterror.h ../common/octree.h \
427   ../common/object.h ../common/color.h ../common/lookup.h pmaprand.h \
428 < ../common/otypes.h data.h func.h ../common/calcomp.h ../common/bsdf.h \
429 < ../common/ccolor.h
428 > ../common/otypes.h ../common/data.h func.h ../common/calcomp.h \
429 > ../common/bsdf.h ../common/ccolor.h
430  
431   pmapopt.o: pmapopt.c pmapparm.h pmaptype.h ../common/rtio.h \
432   ../common/rterror.h
# Line 440 | Line 475 | oocsort.o: oocsort.c oocsort.h ../common/fvect.h
475   oocbuild.o: oocbuild.c oocbuild.h oocsort.h oococt.h
476  
477   oocnn.o: oocnn.c oocnn.h oococt.h oocsort.h
478 +
479 + rxtrace.o rxtmain.o rxpiece.o rxpmain.o rxcmain.o \
480 + RcontribSimulManager.o RpictSimulManager.o \
481 + RtraceSimulManager.o:   RtraceSimulManager.h \
482 + ../common/abitmap.h
483 +
484 + RpictSimulManager.o rxpiece.o rxpmain.o:        RpictSimulManager.h \
485 + ../common/view.h ../common/depthcodec.h ../common/abitmap.h
486 +
487 + rxcmain.o RcontribSimulManager.o:       RcontribSimulManager.h RdataShare.h \
488 + ../common/lookup.h ../common/rtprocess.h
489 +
490 + RdataShareFile.o RdataShareMap.o:       RdataShare.h \
491 + ../common/rtio.h ../common/rterror.h
492 +
493 + RcontribSimulManager.o: source.h func.h \
494 + ../common/selcall.h ../common/calcomp.h \
495 + ../common/resolu.h ../common/platform.h
496 +
497 + rxcmain.o:      func.h ../common/calcomp.h ../common/platform.h
498 +
499 + RpictSimulManager.o:    ../common/random.h

Diff Legend

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