ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/rt/Rmakefile

Comparing ray/src/rt/Rmakefile (file contents):
Revision 2.94 by greg, Fri Aug 2 18:47:25 2024 UTC vs.
Revision 2.96 by greg, Mon Sep 16 23:49:12 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	+	RXPCOBJS = rxpiece.o RpictSimulManager.o RtraceSimulManager.o srcdraw.o
71	+	RXPCSRC = rxpiece.cpp RpictSimulManager.cpp RtraceSimulManager.cpp srcdraw.c
72	+
73		RLOBJS = raycalls.o raypcalls.o rayfifo.o
74		RLSRC = raycalls.c raypcalls.c rayfifo.c
75
#	Line 144 | Line 151 | $(RLIB) $(LIBS) $(DLIBS)
151		$(DESTDIR)/rcontrib:      $(RCOBJS) $(RLIB)
152		$(CC) $(CFLAGS) -o $(DESTDIR)/rcontrib $(RCOBJS) $(RLIB) $(LIBS)
153
154	<	$(DESTDIR)/rxtrace:     $(RATOBJS) $(RCLIB) $(RLIB)
155	<	$(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxtrace $(RATOBJS) $(RCLIB) \
156	<	$(RLIB) $(LIBS)
154	>	$(DESTDIR)/rxtrace:     $(RXTOBJS) $(RCLIB) $(RLIB)
155	>	$(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxtrace $(RXTOBJS) $(RCLIB) \
156	>	$(RLIB) $(CXXLIBS)
157
158	+	$(DESTDIR)/rxpict:      $(RXPOBJS) $(RCLIB) $(RLIB)
159	+	$(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxpict $(RXPOBJS) $(RCLIB) \
160	+	$(RLIB) $(CXXLIBS)
161	+
162	+	$(DESTDIR)/rxpiece:     $(RXPCOBJS) $(RCLIB) $(RLIB)
163	+	$(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxpiece $(RXPCOBJS) $(RCLIB) \
164	+	$(RLIB) $(CXXLIBS)
165	+
166		$(DESTDIR)/lookamb:     lookamb.o ambio.o
167		$(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
168
#	Line 214 | Line 229 | preload.o raycalls.o raytrace.o rtrace.o rv2.o source.
229		srcsupp.o text.o srcdraw.o srcobstr.o virtuals.o:       ../common/otypes.h
230
231		ambient.o ambcomp.o aniso.o ashikhmin.o normal.o p_func.o raycalls.o raytrace.o \
232	<	rpict.o rvmain.o rtmain.o rpmain.o rcmain.o persist.o source.o rv3.o \
232	>	rpict.o rvmain.o rtmain.o rpmain.o rcmain.o rxpiece.o persist.o source.o rv3.o \
233		srcsamp.o virtuals.o:   ../common/random.h
234
235		ambcomp.o ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o \
#	Line 223 | Line 238 | o_mesh.o mx_func.o normal.o o_cone.o o_face.o o_instan
238		raycalls.o raypcalls.o rayfifo.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
239		source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \
240		text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o rcmain.o \
241	<	rcontrib.o rc2.o rc3.o: ray.h \
241	>	rcontrib.o rc2.o rc3.o RtraceSimulManager.o RpictSimulManager.o \
242	>	rxtrace.o rxtmain.o rxpiece.o rxpmain.o:        ray.h \
243		../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \
244		../common/rterror.h ../common/octree.h \
245		../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
#	Line 441 | Line 457 | oocbuild.o: oocbuild.c oocbuild.h oocsort.h oococt.h
457
458		oocnn.o: oocnn.c oocnn.h oococt.h oocsort.h
459
460	<	RtraceSimulManager.o rxtrace.o: RtraceSimulManager.h
460	>	RtraceSimulManager.o rxpiece.o rxpmain.o \
461	>	rxtmain.o rxtrace.o:    RtraceSimulManager.h
462	>
463	>	RpictSimulManager.o rxpiece.o rxpmain.o:        RpictSimulManager.h \
464	>	../common/view.h ../common/depthcodec.h ../common/abitmap.h
465	>
466	>	RpictSimulManager.o:    ../common/random.h

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)