--- ray/src/rt/Rmakefile	2018/11/08 00:54:07	2.85
+++ ray/src/rt/Rmakefile	2023/02/08 17:41:48	2.88
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.85 2018/11/08 00:54:07 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.88 2023/02/08 17:41:48 greg Exp $
 #
 # Compiles for ray tracing programs.
 #
@@ -6,8 +6,10 @@
 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
@@ -58,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 = ratmain.o ratrace.o RtraceSimulManager.o
+RATSRC = ratmain.cpp ratrace.cpp RtraceSimulManager.cpp
+
 RLOBJS = raycalls.o raypcalls.o rayfifo.o
 RLSRC = raycalls.c raypcalls.c rayfifo.c
 
@@ -105,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)/ratrace $(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)
 
@@ -141,6 +144,10 @@ $(RLIB) $(LIBS) $(DLIBS)
 $(DESTDIR)/rcontrib:      $(RCOBJS) $(RLIB)
 	$(CC) $(CFLAGS) -o $(DESTDIR)/rcontrib $(RCOBJS) $(RLIB) $(LIBS)
 
+$(DESTDIR)/ratrace:	$(RATOBJS) $(RCLIB) $(RLIB)
+	$(CXX) $(CXXFLAGS) -o $(DESTDIR)/ratrace $(RATOBJS) $(RCLIB) \
+$(RLIB) $(LIBS)
+
 $(DESTDIR)/lookamb:	lookamb.o ambio.o
 	$(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
 
@@ -177,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: