ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/src/rt/Rmakefile
(Generate patch)

Comparing src/rt/Rmakefile (file contents):
Revision 2.86 by greg, Tue Dec 15 23:54:00 2020 UTC vs.
Revision 2.93 by greg, Fri Nov 17 20:02:07 2023 UTC

# Line 6 | Line 6
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
# Line 58 | Line 60 | RVSRC = rvmain.c rview.c rv2.c rv3.c $(DSRC)
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  
# Line 139 | Line 144 | $(RLIB) $(LIBS) $(DLIBS)
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  
# Line 175 | Line 184 | devcomm.o:     devcomm.c
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:
# Line 204 | Line 213 | initotypes.o m_brdf.o m_bsdf.o m_direct.o m_mirror.o n
213   preload.o raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o \
214   srcsupp.o text.o srcdraw.o srcobstr.o virtuals.o:       ../common/otypes.h
215  
216 < ambient.o ambcomp.o aniso.o ashikhmin.o normal.o raycalls.o raytrace.o \
216 > ambient.o ambcomp.o aniso.o ashikhmin.o normal.o p_func.o raycalls.o raytrace.o \
217   rpict.o rvmain.o rtmain.o rpmain.o rcmain.o persist.o source.o rv3.o \
218   srcsamp.o virtuals.o:   ../common/random.h
219  
# Line 431 | Line 440 | oocsort.o: oocsort.c oocsort.h ../common/fvect.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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines