--- ray/src/rt/Rmakefile 2021/01/19 23:31:47 2.87 +++ ray/src/rt/Rmakefile 2023/11/17 20:02:07 2.93 @@ -1,4 +1,4 @@ -# RCSid: $Id: Rmakefile,v 2.87 2021/01/19 23:31:47 greg Exp $ +# RCSid: $Id: Rmakefile,v 2.93 2023/11/17 20:02:07 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 = 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 @@ -139,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) @@ -204,7 +213,7 @@ initotypes.o m_brdf.o m_bsdf.o m_direct.o m_mirror.o n 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 \ +ambient.o ambcomp.o aniso.o ashikhmin.o normal.o p_func.o raycalls.o raytrace.o \ rpict.o rvmain.o rtmain.o rpmain.o rcmain.o persist.o source.o rv3.o \ srcsamp.o virtuals.o: ../common/random.h @@ -431,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