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.95 by greg, Wed Aug 14 20:05:23 2024 UTC vs.
Revision 2.100 by greg, Mon Dec 9 00:44:29 2024 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
56 < RPSRC = rpmain.c rpict.c srcdraw.c duphead.c persist.c
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
57  
58   RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS)
59   RVSRC = rvmain.c rview.c rv2.c rv3.c $(DSRC)
# Line 67 | Line 67 | RXTSRC = rxtmain.cpp rxtrace.cpp RtraceSimulManager.cp
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 87 | 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
# Line 156 | Line 164 | $(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 217 | 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_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
236 > initotypes.o m_brdf.o m_bsdf.o m_wgmdf.o m_direct.o m_mirror.o normal.o \
237 > o_cone.o preload.o raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o \
238 > m_wgmdf.o srcsupp.o text.o srcdraw.o srcobstr.o \
239 > virtuals.o:     ../common/otypes.h
240  
241   ambient.o ambcomp.o aniso.o ashikhmin.o normal.o p_func.o raycalls.o raytrace.o \
242 < rpict.o rvmain.o rtmain.o rpmain.o rcmain.o persist.o source.o rv3.o \
243 < srcsamp.o virtuals.o:   ../common/random.h
242 > rpict.o rvmain.o rtmain.o rpmain.o rcmain.o rxpiece.o persist.o source.o rv3.o \
243 > srcsamp.o virtuals.o m_wgmdf.o: ../common/random.h
244  
245   ambcomp.o ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o \
246   glass.o m_bsdf.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o \
# Line 232 | Line 249 | raycalls.o raypcalls.o rayfifo.o raytrace.o rpict.o rt
249   source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \
250   text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o rcmain.o \
251   rcontrib.o rc2.o rc3.o RtraceSimulManager.o RpictSimulManager.o \
252 < rxtrace.o rxtmain.o rxpmain.o:  ray.h \
252 > rxtrace.o rxtmain.o rxpiece.o rxpmain.o rxcmain.o m_wgmdf.o \
253 > RcontribSimulManager.o RpictSimulManager.o RtraceSimulManager.o:        ray.h \
254   ../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \
255   ../common/rterror.h ../common/octree.h \
256   ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
257  
258   rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h ../common/resolu.h
259  
260 < m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o \
260 > m_direct.o m_mirror.o m_mist.o raycalls.o \
261   rpict.o rpmain.o rtmain.o rvmain.o source.o srcdraw.o \
262   srcobstr.o srcsamp.o srcsupp.o virtuals.o:      source.h
263  
# Line 291 | Line 309 | aniso.o ashikhmin.o dielectric.o freeobjmem.o glass.o
309   m_alias.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o \
310   mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
311   o_mesh.o p_data.o p_func.o source.o sphere.o t_data.o t_func.o \
312 < srcobstr.o text.o:              rtotypes.h
312 > m_wgmdf.o srcobstr.o text.o:            rtotypes.h
313  
314 + aniso.o ashikhmin.o dielectric.o glass.o m_brdf.o \
315 + m_direct.o m_mirror.o m_mist.o normal.o m_wgmdf.o \
316 + srcobstr.o:     source.h
317 +
318   m_bsdf.o:       ambient.h source.h func.h \
319   ../common/calcomp.h ../common/bsdf.h ../common/random.h
320  
# Line 302 | Line 324 | func.h ../common/calcomp.h ../common/rtprocess.h
324  
325   ambient.o rcmain.o:     ambient.h
326  
327 < rcmain.o:       source.h
327 > rcmain.o rpmain.o rtmain.o rvmain.o rtrace.o \
328 > rcontrib.o source.o srcdraw.o srcobstr.o \
329 > srcsamp.o srcsupp.o srcskipload.o virtuals.o:   source.h
330  
331 < rcontrib.o:     source.h ../common/otypes.h
331 > rcontrib.o:     ../common/otypes.h
332  
333   rc2.o:  ../common/resolu.h
334  
# Line 315 | Line 339 | rc3.o: ../common/selcall.h
339   #
340   ambient.o: pmapparm.h pmaptype.h pmapamb.h pmapdata.h
341  
342 < dielectric.o glass.o normal.o m_brdf.o m_bsdf.o ashikhmin.o aniso.o: \
343 <   pmapparm.h pmaptype.h pmapmat.h pmap.h pmapdata.h
342 > dielectric.o glass.o normal.o m_brdf.o m_bsdf.o \
343 > m_wgmdf.o ashikhmin.o aniso.o:  pmapparm.h pmaptype.h \
344 > pmapmat.h pmap.h pmapdata.h
345    
346   raycalls.o rpmain.o rcmain.o rtmain.o rvmain.o: \
347     pmapparm.h pmaptype.h pmapray.h
# Line 450 | Line 475 | oocbuild.o: oocbuild.c oocbuild.h oocsort.h oococt.h
475  
476   oocnn.o: oocnn.c oocnn.h oococt.h oocsort.h
477  
478 < RtraceSimulManager.o rxpmain.o rxtmain.o rxtrace.o:     RtraceSimulManager.h
478 > rxtrace.o rxtmain.o rxpiece.o rxpmain.o rxcmain.o \
479 > RcontribSimulManager.o RpictSimulManager.o \
480 > RtraceSimulManager.o:   RtraceSimulManager.h \
481 > ../common/abitmap.h
482  
483 < RpictSimulManager.o rxpmain.o:  RpictSimulManager.h ../common/view.h \
484 < ../common/depthcodec.h ../common/abitmap.h
483 > RpictSimulManager.o rxpiece.o rxpmain.o:        RpictSimulManager.h \
484 > ../common/view.h ../common/depthcodec.h ../common/abitmap.h
485 >
486 > rxcmain.o RcontribSimulManager.o:       RcontribSimulManager.h RdataShare.h \
487 > ../common/lookup.h ../common/rtprocess.h
488 >
489 > RdataShareFile.o RdataShareMap.o:       RdataShare.h \
490 > ../common/rtio.h ../common/rterror.h
491 >
492 > RcontribSimulManager.o: source.h func.h \
493 > ../common/selcall.h ../common/calcomp.h \
494 > ../common/resolu.h ../common/platform.h
495 >
496 > rxcmain.o:      func.h ../common/calcomp.h ../common/platform.h
497  
498   RpictSimulManager.o:    ../common/random.h

Diff Legend

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