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.99 by greg, Fri Nov 15 20:47:42 2024 UTC vs.
Revision 2.104 by greg, Wed Oct 22 02:38:27 2025 UTC

# Line 52 | Line 52 | DLIBS = -lX11
52   RTOBJS = rtmain.o rtrace.o duphead.o persist.o
53   RTSRC = rtmain.c rtrace.c duphead.c persist.c
54  
55 < RPOBJS = rpmain.o rpict.o srcdraw.o duphead.o persist.o srcskipload.o
56 < RPSRC = rpmain.c rpict.c srcdraw.c duphead.c persist.c srcskipload.c
55 > RPOBJS = rpmain.o rpict.o srcdraw.o duphead.o persist.o
56 > RPSRC = rpmain.c rpict.c srcdraw.c duphead.c persist.c
57  
58   RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS)
59   RVSRC = rvmain.c rview.c rv2.c rv3.c $(DSRC)
# Line 75 | Line 75 | RdataShareFile.cpp RdataShareMap.cpp
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 95 | 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
# Line 122 | Line 127 | HEADERS = ambient.h ray.h otspecial.h source.h
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 172 | Line 178 | $(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 233 | 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 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:   ../common/random.h
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 248 | Line 260 | raycalls.o raypcalls.o rayfifo.o raytrace.o rpict.o rt
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 RtraceSimulManager.o RpictSimulManager.o \
263 < rxtrace.o rxtmain.o rxpiece.o rxpmain.o rxcmain.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 \
# Line 256 | Line 268 | RcontribSimulManager.o RpictSimulManager.o RtraceSimul
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  
# Line 268 | 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 308 | 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 332 | 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 467 | 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 < rxtrace.o rxtmain.o rxpiece.o rxpmain.o rxcmain.o \
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
# Line 475 | Line 497 | RtraceSimulManager.o:  RtraceSimulManager.h \
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:       RcontribSimulManager.h RdataShare.h \
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 \

Diff Legend

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