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.94 by greg, Fri Aug 2 18:47:25 2024 UTC vs.
Revision 2.99 by greg, Fri Nov 15 20:47:42 2024 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 51 | 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 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   RLOBJS = raycalls.o raypcalls.o rayfifo.o
79   RLSRC = raycalls.c raypcalls.c rayfifo.c
80  
# Line 144 | Line 156 | $(RLIB) $(LIBS) $(DLIBS)
156   $(DESTDIR)/rcontrib:      $(RCOBJS) $(RLIB)
157          $(CC) $(CFLAGS) -o $(DESTDIR)/rcontrib $(RCOBJS) $(RLIB) $(LIBS)
158  
159 < $(DESTDIR)/rxtrace:     $(RATOBJS) $(RCLIB) $(RLIB)
160 <        $(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxtrace $(RATOBJS) $(RCLIB) \
161 < $(RLIB) $(LIBS)
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 214 | Line 238 | preload.o raycalls.o raytrace.o rtrace.o rv2.o source.
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 p_func.o raycalls.o raytrace.o \
241 < rpict.o rvmain.o rtmain.o rpmain.o rcmain.o persist.o source.o rv3.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 223 | 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 441 | Line 467 | oocbuild.o: oocbuild.c oocbuild.h oocsort.h oococt.h
467  
468   oocnn.o: oocnn.c oocnn.h oococt.h oocsort.h
469  
470 < RtraceSimulManager.o rxtrace.o: RtraceSimulManager.h
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