ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/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.95 by greg, Wed Aug 14 20:05:23 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 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   RLOBJS = raycalls.o raypcalls.o rayfifo.o
71   RLSRC = raycalls.c raypcalls.c rayfifo.c
72  
# Line 144 | Line 148 | $(RLIB) $(LIBS) $(DLIBS)
148   $(DESTDIR)/rcontrib:      $(RCOBJS) $(RLIB)
149          $(CC) $(CFLAGS) -o $(DESTDIR)/rcontrib $(RCOBJS) $(RLIB) $(LIBS)
150  
151 < $(DESTDIR)/rxtrace:     $(RATOBJS) $(RCLIB) $(RLIB)
152 <        $(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxtrace $(RATOBJS) $(RCLIB) \
153 < $(RLIB) $(LIBS)
151 > $(DESTDIR)/rxtrace:     $(RXTOBJS) $(RCLIB) $(RLIB)
152 >        $(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxtrace $(RXTOBJS) $(RCLIB) \
153 > $(RLIB) $(CXXLIBS)
154  
155 + $(DESTDIR)/rxpict:      $(RXPOBJS) $(RCLIB) $(RLIB)
156 +        $(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxpict $(RXPOBJS) $(RCLIB) \
157 + $(RLIB) $(CXXLIBS)
158 +
159   $(DESTDIR)/lookamb:     lookamb.o ambio.o
160          $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
161  
# Line 223 | Line 231 | o_mesh.o mx_func.o normal.o o_cone.o o_face.o o_instan
231   raycalls.o raypcalls.o rayfifo.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
232   source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \
233   text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o rcmain.o \
234 < rcontrib.o rc2.o rc3.o: ray.h \
234 > rcontrib.o rc2.o rc3.o RtraceSimulManager.o RpictSimulManager.o \
235 > rxtrace.o rxtmain.o rxpmain.o:  ray.h \
236   ../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \
237   ../common/rterror.h ../common/octree.h \
238   ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
# Line 441 | Line 450 | oocbuild.o: oocbuild.c oocbuild.h oocsort.h oococt.h
450  
451   oocnn.o: oocnn.c oocnn.h oococt.h oocsort.h
452  
453 < RtraceSimulManager.o rxtrace.o: RtraceSimulManager.h
453 > RtraceSimulManager.o rxpmain.o rxtmain.o rxtrace.o:     RtraceSimulManager.h
454 >
455 > RpictSimulManager.o rxpmain.o:  RpictSimulManager.h ../common/view.h \
456 > ../common/depthcodec.h ../common/abitmap.h
457 >
458 > RpictSimulManager.o:    ../common/random.h

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines