| 6 |  | OPT = -O | 
| 7 |  | MACH = -DBSD | 
| 8 |  | CFLAGS = -I../common -L../lib $(OPT) $(MACH) | 
| 9 | + | CXXFLAGS = $(CFLAGS) -std=c++11 | 
| 10 |  | SPECIAL = | 
| 11 |  | CC = cc | 
| 12 | + | CXX = c++ | 
| 13 |  | AR = ar | 
| 14 |  | MLIB = -lm | 
| 15 |  | LINT = lint | 
| 60 |  | RCOBJS = rcmain.o rcontrib.o rc2.o rc3.o | 
| 61 |  | RCSRC = rcmain.c rcontrib.c rc2.c rc3.c | 
| 62 |  |  | 
| 63 | + | RATOBJS = rxtmain.o rxtrace.o RtraceSimulManager.o | 
| 64 | + | RATSRC = rxtmain.cpp rxtrace.cpp RtraceSimulManager.cpp | 
| 65 | + |  | 
| 66 |  | RLOBJS = raycalls.o raypcalls.o rayfifo.o | 
| 67 |  | RLSRC = raycalls.c raypcalls.c rayfifo.c | 
| 68 |  |  | 
| 110 |  | # | 
| 111 |  |  | 
| 112 |  | PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/rcontrib \ | 
| 113 | < | $(DESTDIR)/lookamb $(DESTDIR)/mkpmap $(DESTDIR)/pmapdump | 
| 113 | > | $(DESTDIR)/rxtrace $(DESTDIR)/lookamb $(DESTDIR)/mkpmap $(DESTDIR)/pmapdump | 
| 114 |  |  | 
| 115 |  | all:    $(PROGS) $(RCLIB) $(SPECIAL) | 
| 116 |  |  | 
| 117 |  | install:        all rayinit.cal | 
| 118 |  | $(INSTALL) $(PROGS) $(INSTDIR) | 
| 114 | – | cd $(INSTDIR) ; rm -f rview ; ln -s rvu rview | 
| 115 | – | cd $(INSTDIR) ; rm -f rtcontrib ; ln -s rcontrib rtcontrib | 
| 119 |  | rm -f $(LIBDIR)/rayinit.cal | 
| 120 |  | cp rayinit.cal $(LIBDIR) | 
| 121 |  |  | 
| 144 |  | $(DESTDIR)/rcontrib:      $(RCOBJS) $(RLIB) | 
| 145 |  | $(CC) $(CFLAGS) -o $(DESTDIR)/rcontrib $(RCOBJS) $(RLIB) $(LIBS) | 
| 146 |  |  | 
| 147 | + | $(DESTDIR)/rxtrace:     $(RATOBJS) $(RCLIB) $(RLIB) | 
| 148 | + | $(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxtrace $(RATOBJS) $(RCLIB) \ | 
| 149 | + | $(RLIB) $(LIBS) | 
| 150 | + |  | 
| 151 |  | $(DESTDIR)/lookamb:     lookamb.o ambio.o | 
| 152 |  | $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS) | 
| 153 |  |  | 
| 184 |  |  | 
| 185 |  | Version.c:      VERSION $(RSRC) $(HEADERS) | 
| 186 |  | ( cat VERSION ; date ; whoami ; hostname ) > Version.c | 
| 187 | < | ed - Version.c < verscript.ed | 
| 187 | > | ed - Version.c < verscript.ed || rm Version.c | 
| 188 |  |  | 
| 189 |  | # | 
| 190 |  | # Include dependencies: | 
| 231 |  | rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h ../common/resolu.h | 
| 232 |  |  | 
| 233 |  | m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o \ | 
| 234 | < | rpict.o rpmain.o rtmain.o rvmain.o rv2.o source.o srcdraw.o \ | 
| 234 | > | rpict.o rpmain.o rtmain.o rvmain.o source.o srcdraw.o \ | 
| 235 |  | srcobstr.o srcsamp.o srcsupp.o virtuals.o:      source.h | 
| 236 |  |  | 
| 237 |  | cone.o data.o devcomm.o initotypes.o fprism.o preload.o \ | 
| 241 |  |  | 
| 242 |  | ambio.o:        ../common/fvect.h | 
| 243 |  |  | 
| 244 | < | ambient.o initotypes.o srcobstr.o raytrace.o:   otspecial.h | 
| 244 | > | ambient.o initotypes.o m_alias.o pmapcontrib.o pmapkdt.o \ | 
| 245 | > | pmapooc.o pmapsrc.o pmcontrib2.o \ | 
| 246 | > | raytrace.o rtrace.o rv2.o rv3.o source.o \ | 
| 247 | > | srcdraw.o srcobstr.o virtuals.o:        otspecial.h | 
| 248 |  |  | 
| 249 |  | rpmain.o rtmain.o rvmain.o rpict.o \ | 
| 250 |  | srcdraw.o:      ../common/view.h ../common/resolu.h | 
| 291 |  | ../common/platform.h ../common/paths.h ../common/lookup.h \ | 
| 292 |  | func.h ../common/calcomp.h ../common/rtprocess.h | 
| 293 |  |  | 
| 294 | < | ambient.o rcmain.o:     source.h ambient.h | 
| 294 | > | ambient.o rcmain.o:     ambient.h | 
| 295 |  |  | 
| 296 | + | rcmain.o:       source.h | 
| 297 | + |  | 
| 298 |  | rcontrib.o:     source.h ../common/otypes.h | 
| 299 |  |  | 
| 300 |  | rc2.o:  ../common/resolu.h | 
| 440 |  | oocbuild.o: oocbuild.c oocbuild.h oocsort.h oococt.h | 
| 441 |  |  | 
| 442 |  | oocnn.o: oocnn.c oocnn.h oococt.h oocsort.h | 
| 443 | + |  | 
| 444 | + | RtraceSimulManager.o rxtrace.o: RtraceSimulManager.h |