--- ray/src/rt/Rmakefile	2017/08/14 21:03:24	2.80
+++ ray/src/rt/Rmakefile	2023/09/12 17:00:54	2.91
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.80 2017/08/14 21:03:24 rschregle Exp $
+# RCSid: $Id: Rmakefile,v 2.91 2023/09/12 17:00:54 greg Exp $
 #
 # Compiles for ray tracing programs.
 #
@@ -6,8 +6,11 @@
 OPT = -O
 MACH = -DBSD
 CFLAGS = -I../common -L../lib $(OPT) $(MACH)
+CXXFLAGS = $(CFLAGS) -std=c++11
 SPECIAL = 
 CC = cc
+CXX = c++
+AR = ar
 MLIB = -lm
 LINT = lint
 LINTFLAGS = -DBSD
@@ -57,6 +60,9 @@ RVSRC = rvmain.c rview.c rv2.c rv3.c $(DSRC)
 RCOBJS = rcmain.o rcontrib.o rc2.o rc3.o
 RCSRC = rcmain.c rcontrib.c rc2.c rc3.c
 
+RATOBJS = rxtmain.o rxtrace.o RtraceSimulManager.o
+RATSRC = rxtmain.cpp rxtrace.cpp RtraceSimulManager.cpp
+
 RLOBJS = raycalls.o raypcalls.o rayfifo.o
 RLSRC = raycalls.c raypcalls.c rayfifo.c
 
@@ -104,14 +110,12 @@ HEADERS = ambient.h ray.h data.h otspecial.h source.h
 #
 
 PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/rcontrib \
-$(DESTDIR)/lookamb $(DESTDIR)/mkpmap $(DESTDIR)/pmapdump
+$(DESTDIR)/rxtrace $(DESTDIR)/lookamb $(DESTDIR)/mkpmap $(DESTDIR)/pmapdump
 
 all:	$(PROGS) $(RCLIB) $(SPECIAL)
 
 install:	all rayinit.cal
 	$(INSTALL) $(PROGS) $(INSTDIR)
-	cd $(INSTDIR) ; rm -f rview ; ln -s rvu rview
-	cd $(INSTDIR) ; rm -f rtcontrib ; ln -s rcontrib rtcontrib
 	rm -f $(LIBDIR)/rayinit.cal
 	cp rayinit.cal $(LIBDIR)
 
@@ -140,6 +144,10 @@ $(RLIB) $(LIBS) $(DLIBS)
 $(DESTDIR)/rcontrib:      $(RCOBJS) $(RLIB)
 	$(CC) $(CFLAGS) -o $(DESTDIR)/rcontrib $(RCOBJS) $(RLIB) $(LIBS)
 
+$(DESTDIR)/rxtrace:	$(RATOBJS) $(RCLIB) $(RLIB)
+	$(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxtrace $(RATOBJS) $(RCLIB) \
+$(RLIB) $(LIBS)
+
 $(DESTDIR)/lookamb:	lookamb.o ambio.o
 	$(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
 
@@ -151,12 +159,12 @@ $(DESTDIR)/pmapdump: pmapdump.o pmaptype.o pmapparm.o
 
 $(RLIB):	$(ROBJS) Version.o
 	rm -f $(RLIB)
-	ar rc $(RLIB) $(ROBJS) Version.o
+	$(AR) rc $(RLIB) $(ROBJS) Version.o
 	-ranlib $(RLIB)
 
 $(RCLIB):	$(RLOBJS)
 	rm -f $(RCLIB)
-	ar rc $(RCLIB) $(RLOBJS)
+	$(AR) rc $(RCLIB) $(RLOBJS)
 	-ranlib $(RCLIB)
 
 #
@@ -176,7 +184,7 @@ devcomm.o:	devcomm.c
 
 Version.c:	VERSION $(RSRC) $(HEADERS)
 	( cat VERSION ; date ; whoami ; hostname ) > Version.c
-	ed - Version.c < verscript.ed
+	ed - Version.c < verscript.ed || rm Version.c
 
 #
 # Include dependencies:
@@ -201,9 +209,9 @@ rtrace.o rvmain.o rv2.o rv3.o:	../common/octree.h
 o_instance.o:	../common/instance.h
 
 ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o glass.o \
-initotypes.o m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o preload.o \
-raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \
-srcdraw.o srcobstr.o virtuals.o:	../common/otypes.h
+initotypes.o m_brdf.o m_bsdf.o m_direct.o m_mirror.o normal.o o_cone.o \
+preload.o raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o \
+srcsupp.o text.o srcdraw.o srcobstr.o virtuals.o:	../common/otypes.h
 
 ambient.o ambcomp.o aniso.o ashikhmin.o normal.o raycalls.o raytrace.o \
 rpict.o rvmain.o rtmain.o rpmain.o rcmain.o persist.o source.o rv3.o \
@@ -223,7 +231,7 @@ rcontrib.o rc2.o rc3.o:	ray.h \
 rv2.o rv3.o rview.o:	rpaint.h driver.h ../common/view.h ../common/resolu.h
 
 m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o \
-rpict.o rpmain.o rtmain.o rvmain.o rv2.o source.o srcdraw.o \
+rpict.o rpmain.o rtmain.o rvmain.o source.o srcdraw.o \
 srcobstr.o srcsamp.o srcsupp.o virtuals.o:	source.h
 
 cone.o data.o devcomm.o initotypes.o fprism.o preload.o \
@@ -233,7 +241,10 @@ duphead.o octree.o:	../common/standard.h ../common/rtm
 
 ambio.o:	../common/fvect.h
 
-initotypes.o srcobstr.o raytrace.o:	otspecial.h
+ambient.o initotypes.o m_alias.o pmapcontrib.o pmapkdt.o \
+pmapooc.o pmapsrc.o pmcontrib2.o \
+raytrace.o rtrace.o rv2.o rv3.o source.o \
+srcdraw.o srcobstr.o virtuals.o:	otspecial.h
 
 rpmain.o rtmain.o rvmain.o rpict.o \
 srcdraw.o:	../common/view.h ../common/resolu.h
@@ -280,8 +291,10 @@ rcmain.o rcontrib.o rc2.o rc3.o:	rcontrib.h \
 ../common/platform.h ../common/paths.h ../common/lookup.h \
 func.h ../common/calcomp.h ../common/rtprocess.h
 
-rcmain.o:	source.h ambient.h
+ambient.o rcmain.o:	ambient.h
 
+rcmain.o:	source.h
+
 rcontrib.o:	source.h ../common/otypes.h
 
 rc2.o:	../common/resolu.h
@@ -427,3 +440,5 @@ oocsort.o: oocsort.c oocsort.h ../common/fvect.h
 oocbuild.o: oocbuild.c oocbuild.h oocsort.h oococt.h
 
 oocnn.o: oocnn.c oocnn.h oococt.h oocsort.h
+
+RtraceSimulManager.o rxtrace.o:	RtraceSimulManager.h