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.78 by greg, Mon Sep 26 20:19:30 2016 UTC vs.
Revision 2.96 by greg, Mon Sep 16 23:49:12 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
16   LINTFLAGS = -DBSD
# Line 31 | Line 34 | LIBDIR = /usr/local/lib/ray
34   RLIB = ../lib/libradiance.a
35   RCLIB = ../lib/libraycalls.a
36   LIBS = -lrtrad $(MLIB)
37 + CXXLIBS = -lcpprad $(LIBS)
38  
39   #
40   # Device drivers for rvu (see also devtable.c):
# Line 57 | Line 61 | RVSRC = rvmain.c rview.c rv2.c rv3.c $(DSRC)
61   RCOBJS = rcmain.o rcontrib.o rc2.o rc3.o
62   RCSRC = rcmain.c rcontrib.c rc2.c rc3.c
63  
64 + RXTOBJS = rxtmain.o rxtrace.o RtraceSimulManager.o
65 + RXTSRC = rxtmain.cpp rxtrace.cpp RtraceSimulManager.cpp
66 +
67 + RXPOBJS = rxpmain.o RpictSimulManager.o RtraceSimulManager.o srcdraw.o
68 + RXPSRC = rxpmain.cpp RpictSimulManager.cpp RtraceSimulManager.cpp srcdraw.c
69 +
70 + RXPCOBJS = rxpiece.o RpictSimulManager.o RtraceSimulManager.o srcdraw.o
71 + RXPCSRC = rxpiece.cpp RpictSimulManager.cpp RtraceSimulManager.cpp srcdraw.c
72 +
73   RLOBJS = raycalls.o raypcalls.o rayfifo.o
74   RLSRC = raycalls.c raypcalls.c rayfifo.c
75  
# Line 85 | Line 98 | MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.
98   MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
99   MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c
100  
101 < SUPPOBJS = func.o noise3.o data.o
102 < SUPPSRC = func.c noise3.c data.c
101 > SUPPOBJS = func.o noise3.o
102 > SUPPSRC = func.c noise3.c
103  
104   PMOBJS = pmap.o pmapsrc.o pmapmat.o pmaprand.o pmapio.o pmapdata.o \
105           pmapbias.o pmapparm.o pmapcontrib.o pmapamb.o pmapray.o pmapopt.o \
106           pmapdiag.o pmaptype.o oocmorton.o oococt.o oocsort.o oocbuild.o \
107 <         oocnn.o ooccache.o pmutil.o
107 >         oocnn.o ooccache.o pmutil.o pmcontrib2.o
108   PMSRC = pmap.c pmapsrc.c pmapmat.c pmaprand.c pmapio.c pmapdata.c \
109          pmapbias.c pmapparm.c pmapcontrib.c pmapamb.c pmapray.c pmapopt.c \
110          pmapdiag.c pmaptype.c pmapkdt.c pmapooc.c oocmorton.c oococt.c \
111 <        oocsort.c oocbuild.c oocnn.c ooccache.c pmutil.c
111 >        oocsort.c oocbuild.c oocnn.c ooccache.c pmutil.c pmcontrib2.c
112  
113 < HEADERS = ambient.h ray.h data.h otspecial.h source.h
113 > HEADERS = ambient.h ray.h otspecial.h source.h
114  
115   #
116   # What this makefile produces:
# Line 110 | Line 123 | all:   $(PROGS) $(RCLIB) $(SPECIAL)
123  
124   install:        all rayinit.cal
125          $(INSTALL) $(PROGS) $(INSTDIR)
113 –        cd $(INSTDIR) ; rm -f rview ; ln -s rvu rview
114 –        cd $(INSTDIR) ; rm -f rtcontrib ; ln -s rcontrib rtcontrib
126          rm -f $(LIBDIR)/rayinit.cal
127          cp rayinit.cal $(LIBDIR)
128  
# Line 140 | Line 151 | $(RLIB) $(LIBS) $(DLIBS)
151   $(DESTDIR)/rcontrib:      $(RCOBJS) $(RLIB)
152          $(CC) $(CFLAGS) -o $(DESTDIR)/rcontrib $(RCOBJS) $(RLIB) $(LIBS)
153  
154 + $(DESTDIR)/rxtrace:     $(RXTOBJS) $(RCLIB) $(RLIB)
155 +        $(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxtrace $(RXTOBJS) $(RCLIB) \
156 + $(RLIB) $(CXXLIBS)
157 +
158 + $(DESTDIR)/rxpict:      $(RXPOBJS) $(RCLIB) $(RLIB)
159 +        $(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxpict $(RXPOBJS) $(RCLIB) \
160 + $(RLIB) $(CXXLIBS)
161 +
162 + $(DESTDIR)/rxpiece:     $(RXPCOBJS) $(RCLIB) $(RLIB)
163 +        $(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxpiece $(RXPCOBJS) $(RCLIB) \
164 + $(RLIB) $(CXXLIBS)
165 +
166   $(DESTDIR)/lookamb:     lookamb.o ambio.o
167          $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
168  
# Line 151 | Line 174 | $(DESTDIR)/pmapdump: pmapdump.o pmaptype.o pmapparm.o
174  
175   $(RLIB):        $(ROBJS) Version.o
176          rm -f $(RLIB)
177 <        ar rc $(RLIB) $(ROBJS) Version.o
177 >        $(AR) rc $(RLIB) $(ROBJS) Version.o
178          -ranlib $(RLIB)
179  
180   $(RCLIB):       $(RLOBJS)
181          rm -f $(RCLIB)
182 <        ar rc $(RCLIB) $(RLOBJS)
182 >        $(AR) rc $(RCLIB) $(RLOBJS)
183          -ranlib $(RCLIB)
184  
185   #
# Line 176 | Line 199 | devcomm.o:     devcomm.c
199  
200   Version.c:      VERSION $(RSRC) $(HEADERS)
201          ( cat VERSION ; date ; whoami ; hostname ) > Version.c
202 <        ed - Version.c < verscript.ed
202 >        ed - Version.c < verscript.ed || rm Version.c
203  
204   #
205   # Include dependencies:
206   #
207  
208 < ambio.o colortab.o data.o devcomm.o \
208 > ambio.o colortab.o devcomm.o \
209   devmain.o lookamb.o rview.o x11.o:      ../common/color.h
210  
211   freeobjmem.o o_cone.o srcsupp.o:        ../common/cone.h
212  
213 < data.o freeobjmem.o m_brdf.o mx_data.o \
214 < p_data.o raycalls.o t_data.o:   data.h
213 > freeobjmem.o m_brdf.o mx_data.o \
214 > p_data.o raycalls.o t_data.o:   ../common/data.h
215  
216   devcomm.o devmain.o devtable.o \
217   editline.o x11.o:       driver.h
# Line 201 | Line 224 | rtrace.o rvmain.o rv2.o rv3.o: ../common/octree.h
224   o_instance.o:   ../common/instance.h
225  
226   ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o glass.o \
227 < initotypes.o m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o preload.o \
228 < raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \
229 < srcdraw.o srcobstr.o virtuals.o:        ../common/otypes.h
227 > initotypes.o m_brdf.o m_bsdf.o m_direct.o m_mirror.o normal.o o_cone.o \
228 > preload.o raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o \
229 > srcsupp.o text.o srcdraw.o srcobstr.o virtuals.o:       ../common/otypes.h
230  
231 < ambient.o ambcomp.o aniso.o ashikhmin.o normal.o raycalls.o raytrace.o \
232 < rpict.o rvmain.o rtmain.o rpmain.o rcmain.o persist.o source.o rv3.o \
231 > ambient.o ambcomp.o aniso.o ashikhmin.o normal.o p_func.o raycalls.o raytrace.o \
232 > rpict.o rvmain.o rtmain.o rpmain.o rcmain.o rxpiece.o persist.o source.o rv3.o \
233   srcsamp.o virtuals.o:   ../common/random.h
234  
235   ambcomp.o ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o \
# Line 215 | Line 238 | o_mesh.o mx_func.o normal.o o_cone.o o_face.o o_instan
238   raycalls.o raypcalls.o rayfifo.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
239   source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \
240   text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o rcmain.o \
241 < rcontrib.o rc2.o rc3.o: ray.h \
241 > rcontrib.o rc2.o rc3.o RtraceSimulManager.o RpictSimulManager.o \
242 > rxtrace.o rxtmain.o rxpiece.o rxpmain.o:        ray.h \
243   ../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \
244   ../common/rterror.h ../common/octree.h \
245   ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
# Line 223 | Line 247 | rcontrib.o rc2.o rc3.o:        ray.h \
247   rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h ../common/resolu.h
248  
249   m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o \
250 < rpict.o rpmain.o rtmain.o rvmain.o rv2.o source.o srcdraw.o \
250 > rpict.o rpmain.o rtmain.o rvmain.o source.o srcdraw.o \
251   srcobstr.o srcsamp.o srcsupp.o virtuals.o:      source.h
252  
253 < cone.o data.o devcomm.o initotypes.o fprism.o preload.o \
253 > cone.o devcomm.o initotypes.o fprism.o preload.o \
254   duphead.o octree.o:     ../common/standard.h ../common/rtmisc.h \
255   ../common/rtio.h ../common/rtmath.h \
256   ../common/rterror.h ../common/mat4.h ../common/fvect.h
257  
258   ambio.o:        ../common/fvect.h
259  
260 < initotypes.o srcobstr.o raytrace.o:     otspecial.h
260 > ambient.o initotypes.o m_alias.o pmapcontrib.o pmapkdt.o \
261 > pmapooc.o pmapsrc.o pmcontrib2.o \
262 > raytrace.o rtrace.o rv2.o rv3.o source.o \
263 > srcdraw.o srcobstr.o virtuals.o:        otspecial.h
264  
265   rpmain.o rtmain.o rvmain.o rpict.o \
266   srcdraw.o:      ../common/view.h ../common/resolu.h
# Line 246 | Line 273 | x11.o: x11icon.h
273  
274   ambient.o ambcomp.o ambio.o lookamb.o raycalls.o:       ambient.h
275  
276 < data.o rpmain.o rtmain.o rvmain.o rpict.o rtrace.o \
276 > rpmain.o rtmain.o rvmain.o rpict.o rtrace.o \
277   rv2.o:  ../common/resolu.h
278  
279   aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o p_data.o \
280   p_func.o t_data.o t_func.o:     func.h ../common/calcomp.h
281  
282 < preload.o:      data.h func.h ../common/object.h ../common/face.h \
282 > preload.o:      func.h ../common/data.h ../common/object.h ../common/face.h \
283   ../common/cone.h ../common/instance.h ../common/mesh.h \
284   ../common/color.h ../common/bsdf.h ../common/otypes.h
285  
# Line 280 | Line 307 | rcmain.o rcontrib.o rc2.o rc3.o:       rcontrib.h \
307   ../common/platform.h ../common/paths.h ../common/lookup.h \
308   func.h ../common/calcomp.h ../common/rtprocess.h
309  
310 < rcmain.o:       source.h ambient.h
310 > ambient.o rcmain.o:     ambient.h
311  
312 + rcmain.o:       source.h
313 +
314   rcontrib.o:     source.h ../common/otypes.h
315  
316   rc2.o:  ../common/resolu.h
# Line 326 | Line 355 | pmap.o: pmap.c pmap.h pmapparm.h pmaptype.h pmapdata.h
355   ../common/standard.h ../common/copyright.h ../common/rtio.h \
356   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
357   ../common/fvect.h ../common/rterror.h ../common/octree.h \
358 < ../common/object.h ../common/color.h ../common/lookup.h pmapmat.h \
359 < pmapsrc.h source.h pmaprand.h pmapio.h pmapbias.h pmapdiag.h \
360 < ../common/platform.h ../common/otypes.h
358 > ../common/object.h ../common/color.h ../common/paths.h \
359 > ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmapsrc.h source.h pmaprand.h \
360 > pmapio.h pmapbias.h pmapdiag.h ../common/platform.h ../common/otypes.h
361  
362   pmapcontrib.o: pmapcontrib.c pmapcontrib.h pmapdata.h ray.h \
363   ../common/standard.h ../common/copyright.h ../common/rtio.h \
364   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
365   ../common/fvect.h ../common/rterror.h ../common/octree.h \
366   ../common/object.h ../common/color.h pmapparm.h pmaptype.h \
367 < ../common/lookup.h pmap.h pmapmat.h pmapsrc.h source.h pmaprand.h \
368 < pmapio.h pmapdiag.h ../common/platform.h rcontrib.h ../common/paths.h \
367 > ../common/paths.h ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmap.h \
368 > pmapsrc.h source.h pmaprand.h pmapio.h pmapdiag.h ../common/platform.h \
369 > rcontrib.h ../common/rtprocess.h ../common/paths.h func.h \
370 > ../common/calcomp.h ../common/otypes.h
371 >
372 > pmapdata.o: pmapdata.c pmapdata.h ray.h ../common/standard.h \
373 > ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
374 > ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
375 > ../common/rterror.h ../common/octree.h ../common/object.h \
376 > ../common/color.h pmapparm.h pmaptype.h ../common/paths.h \
377 > ../common/lookup.h pmapkdt.h pmapooc.h pmaprand.h pmapmat.h pmap.h \
378 > ../common/otypes.h source.h rcontrib.h ../common/platform.h \
379   ../common/rtprocess.h ../common/paths.h func.h ../common/calcomp.h \
380 < ../common/otypes.h
380 > ../common/random.h pmapkdt.c pmapooc.c
381  
343 – pmapdata.o: pmapdata.c pmap.h pmapparm.h pmaptype.h pmapdata.h ray.h \
344 – pmapkdt.h pmapkdt.c pmapooc.h pmapooc.c oococt.h oocnn.h ooccache.h \
345 – ../common/standard.h ../common/copyright.h ../common/rtio.h \
346 – ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
347 – ../common/fvect.h ../common/rterror.h ../common/octree.h \
348 – ../common/object.h ../common/color.h ../common/lookup.h pmaprand.h \
349 – pmapmat.h ../common/otypes.h source.h rcontrib.h ../common/platform.h \
350 – ../common/paths.h ../common/rtprocess.h ../common/paths.h func.h \
351 – ../common/calcomp.h
352 –
382   pmapdiag.o: pmapdiag.c pmapdiag.h ../common/platform.h pmapdata.h ray.h \
383   ../common/standard.h ../common/copyright.h ../common/rtio.h \
384   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
# Line 368 | Line 397 | pmapio.o: pmapio.c pmapio.h pmapdata.h ray.h ../common
397   ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
398   ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
399   ../common/rterror.h ../common/octree.h ../common/object.h \
400 < ../common/color.h pmapparm.h pmaptype.h ../common/lookup.h pmapdiag.h \
401 < ../common/platform.h ../common/resolu.h
400 > ../common/color.h pmapparm.h pmaptype.h ../common/paths.h \
401 > ../common/lookup.h pmapkdt.h pmapooc.h pmapdiag.h ../common/platform.h \
402 > ../common/resolu.h
403  
404   pmapmat.o: pmapmat.c pmapmat.h pmap.h pmapparm.h pmaptype.h pmapdata.h \
405   ray.h ../common/standard.h ../common/copyright.h ../common/rtio.h \
406   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
407   ../common/fvect.h ../common/rterror.h ../common/octree.h \
408   ../common/object.h ../common/color.h ../common/lookup.h pmaprand.h \
409 < ../common/otypes.h data.h func.h ../common/calcomp.h ../common/bsdf.h \
410 < ../common/ccolor.h
409 > ../common/otypes.h ../common/data.h func.h ../common/calcomp.h \
410 > ../common/bsdf.h ../common/ccolor.h
411  
412   pmapopt.o: pmapopt.c pmapparm.h pmaptype.h ../common/rtio.h \
413   ../common/rterror.h
# Line 386 | Line 416 | pmapparm.o: pmapparm.c pmapparm.h pmaptype.h pmapdata.
416   ../common/standard.h ../common/copyright.h ../common/rtio.h \
417   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
418   ../common/fvect.h ../common/rterror.h ../common/octree.h \
419 < ../common/object.h ../common/color.h ../common/lookup.h
419 > ../common/object.h ../common/color.h ../common/paths.h \
420 > ../common/lookup.h pmapkdt.h pmapooc.h
421  
422   pmapray.o: pmapray.c pmapray.h ray.h ../common/standard.h \
423   ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
# Line 403 | Line 434 | pmapsrc.o: pmapsrc.c pmapsrc.h ray.h ../common/standar
434   ../common/lookup.h pmaprand.h ../common/otypes.h
435  
436   pmutil.o:       pmap.h pmapio.h pmapdata.h pmapparm.h pmaptype.h pmapbias.h \
437 < ../common/otypes.h
437 >  ../common/otypes.h
438  
439   pmaptype.o: pmaptype.c pmaptype.h
440  
441 + mkpmap.o: mkpmap.c pmap.h pmapparm.h pmaptype.h pmapdata.h ray.h \
442 + ../common/standard.h ../common/copyright.h ../common/rtio.h \
443 + ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
444 + ../common/fvect.h ../common/rterror.h ../common/octree.h \
445 + ../common/object.h ../common/color.h ../common/paths.h \
446 + ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmapcontrib.h pmaprand.h \
447 + ambient.h ../common/resolu.h source.h
448 +      
449   oococt.o: oococt.c oococt.h oocsort.h ooccache.h \
450   ../common/rtio.h ../common/fvect.h
451  
# Line 417 | Line 456 | oocsort.o: oocsort.c oocsort.h ../common/fvect.h
456   oocbuild.o: oocbuild.c oocbuild.h oocsort.h oococt.h
457  
458   oocnn.o: oocnn.c oocnn.h oococt.h oocsort.h
459 +
460 + RtraceSimulManager.o rxpiece.o rxpmain.o \
461 + rxtmain.o rxtrace.o:    RtraceSimulManager.h
462 +
463 + RpictSimulManager.o rxpiece.o rxpmain.o:        RpictSimulManager.h \
464 + ../common/view.h ../common/depthcodec.h ../common/abitmap.h
465 +
466 + RpictSimulManager.o:    ../common/random.h

Diff Legend

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