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

Comparing ray/src/rt/Rmakefile (file contents):
Revision 2.83 by greg, Tue Jul 3 22:29:01 2018 UTC vs.
Revision 2.94 by greg, Fri Aug 2 18:47:25 2024 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 86 | Line 91 | MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.
91   MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
92   MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c
93  
94 < SUPPOBJS = func.o noise3.o data.o
95 < SUPPSRC = func.c noise3.c data.c
94 > SUPPOBJS = func.o noise3.o
95 > SUPPSRC = func.c noise3.c
96  
97   PMOBJS = pmap.o pmapsrc.o pmapmat.o pmaprand.o pmapio.o pmapdata.o \
98           pmapbias.o pmapparm.o pmapcontrib.o pmapamb.o pmapray.o pmapopt.o \
# Line 98 | Line 103 | PMSRC = pmap.c pmapsrc.c pmapmat.c pmaprand.c pmapio.c
103          pmapdiag.c pmaptype.c pmapkdt.c pmapooc.c oocmorton.c oococt.c \
104          oocsort.c oocbuild.c oocnn.c ooccache.c pmutil.c pmcontrib2.c
105  
106 < HEADERS = ambient.h ray.h data.h otspecial.h source.h
106 > HEADERS = ambient.h ray.h otspecial.h source.h
107  
108   #
109   # What this makefile produces:
# Line 111 | Line 116 | 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  
# Line 141 | 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 177 | 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:
191   #
192  
193 < ambio.o colortab.o data.o devcomm.o \
193 > ambio.o colortab.o devcomm.o \
194   devmain.o lookamb.o rview.o x11.o:      ../common/color.h
195  
196   freeobjmem.o o_cone.o srcsupp.o:        ../common/cone.h
197  
198 < data.o freeobjmem.o m_brdf.o mx_data.o \
199 < p_data.o raycalls.o t_data.o:   data.h
198 > freeobjmem.o m_brdf.o mx_data.o \
199 > p_data.o raycalls.o t_data.o:   ../common/data.h
200  
201   devcomm.o devmain.o devtable.o \
202   editline.o x11.o:       driver.h
# Line 206 | 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 224 | Line 231 | rcontrib.o rc2.o rc3.o:        ray.h \
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 \
237 > cone.o devcomm.o initotypes.o fprism.o preload.o \
238   duphead.o octree.o:     ../common/standard.h ../common/rtmisc.h \
239   ../common/rtio.h ../common/rtmath.h \
240   ../common/rterror.h ../common/mat4.h ../common/fvect.h
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
# Line 247 | Line 257 | x11.o: x11icon.h
257  
258   ambient.o ambcomp.o ambio.o lookamb.o raycalls.o:       ambient.h
259  
260 < data.o rpmain.o rtmain.o rvmain.o rpict.o rtrace.o \
260 > rpmain.o rtmain.o rvmain.o rpict.o rtrace.o \
261   rv2.o:  ../common/resolu.h
262  
263   aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o p_data.o \
264   p_func.o t_data.o t_func.o:     func.h ../common/calcomp.h
265  
266 < preload.o:      data.h func.h ../common/object.h ../common/face.h \
266 > preload.o:      func.h ../common/data.h ../common/object.h ../common/face.h \
267   ../common/cone.h ../common/instance.h ../common/mesh.h \
268   ../common/color.h ../common/bsdf.h ../common/otypes.h
269  
# Line 281 | Line 291 | rcmain.o rcontrib.o rc2.o rc3.o:       rcontrib.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
# Line 378 | Line 390 | pmapmat.o: pmapmat.c pmapmat.h pmap.h pmapparm.h pmapt
390   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
391   ../common/fvect.h ../common/rterror.h ../common/octree.h \
392   ../common/object.h ../common/color.h ../common/lookup.h pmaprand.h \
393 < ../common/otypes.h data.h func.h ../common/calcomp.h ../common/bsdf.h \
394 < ../common/ccolor.h
393 > ../common/otypes.h ../common/data.h func.h ../common/calcomp.h \
394 > ../common/bsdf.h ../common/ccolor.h
395  
396   pmapopt.o: pmapopt.c pmapparm.h pmaptype.h ../common/rtio.h \
397   ../common/rterror.h
# Line 428 | 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