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

Comparing ray/src/rt/Rmakefile (file contents):
Revision 2.77 by rschregle, Tue May 17 17:39:47 2016 UTC vs.
Revision 2.95 by greg, Wed Aug 14 20:05:23 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   RLOBJS = raycalls.o raypcalls.o rayfifo.o
71   RLSRC = raycalls.c raypcalls.c rayfifo.c
72  
# Line 85 | Line 95 | MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.
95   MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
96   MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c
97  
98 < SUPPOBJS = func.o noise3.o data.o
99 < SUPPSRC = func.c noise3.c data.c
98 > SUPPOBJS = func.o noise3.o
99 > SUPPSRC = func.c noise3.c
100  
101   PMOBJS = pmap.o pmapsrc.o pmapmat.o pmaprand.o pmapio.o pmapdata.o \
102           pmapbias.o pmapparm.o pmapcontrib.o pmapamb.o pmapray.o pmapopt.o \
103           pmapdiag.o pmaptype.o oocmorton.o oococt.o oocsort.o oocbuild.o \
104 <         oocnn.o ooccache.o
104 >         oocnn.o ooccache.o pmutil.o pmcontrib2.o
105   PMSRC = pmap.c pmapsrc.c pmapmat.c pmaprand.c pmapio.c pmapdata.c \
106          pmapbias.c pmapparm.c pmapcontrib.c pmapamb.c pmapray.c pmapopt.c \
107          pmapdiag.c pmaptype.c pmapkdt.c pmapooc.c oocmorton.c oococt.c \
108 <        oocsort.c oocbuild.c oocnn.c ooccache.c
108 >        oocsort.c oocbuild.c oocnn.c ooccache.c pmutil.c pmcontrib2.c
109  
110 < HEADERS = ambient.h ray.h data.h otspecial.h source.h
110 > HEADERS = ambient.h ray.h otspecial.h source.h
111  
112   #
113   # What this makefile produces:
# Line 110 | Line 120 | all:   $(PROGS) $(RCLIB) $(SPECIAL)
120  
121   install:        all rayinit.cal
122          $(INSTALL) $(PROGS) $(INSTDIR)
113 –        cd $(INSTDIR) ; rm -f rview ; ln -s rvu rview
114 –        cd $(INSTDIR) ; rm -f rtcontrib ; ln -s rcontrib rtcontrib
123          rm -f $(LIBDIR)/rayinit.cal
124          cp rayinit.cal $(LIBDIR)
125  
# Line 140 | Line 148 | $(RLIB) $(LIBS) $(DLIBS)
148   $(DESTDIR)/rcontrib:      $(RCOBJS) $(RLIB)
149          $(CC) $(CFLAGS) -o $(DESTDIR)/rcontrib $(RCOBJS) $(RLIB) $(LIBS)
150  
151 + $(DESTDIR)/rxtrace:     $(RXTOBJS) $(RCLIB) $(RLIB)
152 +        $(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxtrace $(RXTOBJS) $(RCLIB) \
153 + $(RLIB) $(CXXLIBS)
154 +
155 + $(DESTDIR)/rxpict:      $(RXPOBJS) $(RCLIB) $(RLIB)
156 +        $(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxpict $(RXPOBJS) $(RCLIB) \
157 + $(RLIB) $(CXXLIBS)
158 +
159   $(DESTDIR)/lookamb:     lookamb.o ambio.o
160          $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
161  
# Line 151 | Line 167 | $(DESTDIR)/pmapdump: pmapdump.o pmaptype.o pmapparm.o
167  
168   $(RLIB):        $(ROBJS) Version.o
169          rm -f $(RLIB)
170 <        ar rc $(RLIB) $(ROBJS) Version.o
170 >        $(AR) rc $(RLIB) $(ROBJS) Version.o
171          -ranlib $(RLIB)
172  
173   $(RCLIB):       $(RLOBJS)
174          rm -f $(RCLIB)
175 <        ar rc $(RCLIB) $(RLOBJS)
175 >        $(AR) rc $(RCLIB) $(RLOBJS)
176          -ranlib $(RCLIB)
177  
178   #
# Line 176 | Line 192 | devcomm.o:     devcomm.c
192  
193   Version.c:      VERSION $(RSRC) $(HEADERS)
194          ( cat VERSION ; date ; whoami ; hostname ) > Version.c
195 <        ed - Version.c < verscript.ed
195 >        ed - Version.c < verscript.ed || rm Version.c
196  
197   #
198   # Include dependencies:
199   #
200  
201 < ambio.o colortab.o data.o devcomm.o \
201 > ambio.o colortab.o devcomm.o \
202   devmain.o lookamb.o rview.o x11.o:      ../common/color.h
203  
204   freeobjmem.o o_cone.o srcsupp.o:        ../common/cone.h
205  
206 < data.o freeobjmem.o m_brdf.o mx_data.o \
207 < p_data.o raycalls.o t_data.o:   data.h
206 > freeobjmem.o m_brdf.o mx_data.o \
207 > p_data.o raycalls.o t_data.o:   ../common/data.h
208  
209   devcomm.o devmain.o devtable.o \
210   editline.o x11.o:       driver.h
# Line 201 | Line 217 | rtrace.o rvmain.o rv2.o rv3.o: ../common/octree.h
217   o_instance.o:   ../common/instance.h
218  
219   ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o glass.o \
220 < initotypes.o m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o preload.o \
221 < raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \
222 < srcdraw.o srcobstr.o virtuals.o:        ../common/otypes.h
220 > initotypes.o m_brdf.o m_bsdf.o m_direct.o m_mirror.o normal.o o_cone.o \
221 > preload.o raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o \
222 > srcsupp.o text.o srcdraw.o srcobstr.o virtuals.o:       ../common/otypes.h
223  
224 < ambient.o ambcomp.o aniso.o ashikhmin.o normal.o raycalls.o raytrace.o \
224 > ambient.o ambcomp.o aniso.o ashikhmin.o normal.o p_func.o raycalls.o raytrace.o \
225   rpict.o rvmain.o rtmain.o rpmain.o rcmain.o persist.o source.o rv3.o \
226   srcsamp.o virtuals.o:   ../common/random.h
227  
# Line 215 | Line 231 | o_mesh.o mx_func.o normal.o o_cone.o o_face.o o_instan
231   raycalls.o raypcalls.o rayfifo.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
232   source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \
233   text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o rcmain.o \
234 < rcontrib.o rc2.o rc3.o: ray.h \
234 > rcontrib.o rc2.o rc3.o RtraceSimulManager.o RpictSimulManager.o \
235 > rxtrace.o rxtmain.o rxpmain.o:  ray.h \
236   ../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \
237   ../common/rterror.h ../common/octree.h \
238   ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
# Line 223 | Line 240 | rcontrib.o rc2.o rc3.o:        ray.h \
240   rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h ../common/resolu.h
241  
242   m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o \
243 < rpict.o rpmain.o rtmain.o rvmain.o rv2.o source.o srcdraw.o \
243 > rpict.o rpmain.o rtmain.o rvmain.o source.o srcdraw.o \
244   srcobstr.o srcsamp.o srcsupp.o virtuals.o:      source.h
245  
246 < cone.o data.o devcomm.o initotypes.o fprism.o preload.o \
246 > cone.o devcomm.o initotypes.o fprism.o preload.o \
247   duphead.o octree.o:     ../common/standard.h ../common/rtmisc.h \
248   ../common/rtio.h ../common/rtmath.h \
249   ../common/rterror.h ../common/mat4.h ../common/fvect.h
250  
251   ambio.o:        ../common/fvect.h
252  
253 < initotypes.o srcobstr.o raytrace.o:     otspecial.h
253 > ambient.o initotypes.o m_alias.o pmapcontrib.o pmapkdt.o \
254 > pmapooc.o pmapsrc.o pmcontrib2.o \
255 > raytrace.o rtrace.o rv2.o rv3.o source.o \
256 > srcdraw.o srcobstr.o virtuals.o:        otspecial.h
257  
258   rpmain.o rtmain.o rvmain.o rpict.o \
259   srcdraw.o:      ../common/view.h ../common/resolu.h
# Line 246 | Line 266 | x11.o: x11icon.h
266  
267   ambient.o ambcomp.o ambio.o lookamb.o raycalls.o:       ambient.h
268  
269 < data.o rpmain.o rtmain.o rvmain.o rpict.o rtrace.o \
269 > rpmain.o rtmain.o rvmain.o rpict.o rtrace.o \
270   rv2.o:  ../common/resolu.h
271  
272   aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o p_data.o \
273   p_func.o t_data.o t_func.o:     func.h ../common/calcomp.h
274  
275 < preload.o:      data.h func.h ../common/object.h ../common/face.h \
275 > preload.o:      func.h ../common/data.h ../common/object.h ../common/face.h \
276   ../common/cone.h ../common/instance.h ../common/mesh.h \
277   ../common/color.h ../common/bsdf.h ../common/otypes.h
278  
# Line 280 | Line 300 | rcmain.o rcontrib.o rc2.o rc3.o:       rcontrib.h \
300   ../common/platform.h ../common/paths.h ../common/lookup.h \
301   func.h ../common/calcomp.h ../common/rtprocess.h
302  
303 < rcmain.o:       source.h ambient.h
303 > ambient.o rcmain.o:     ambient.h
304  
305 + rcmain.o:       source.h
306 +
307   rcontrib.o:     source.h ../common/otypes.h
308  
309   rc2.o:  ../common/resolu.h
# Line 326 | Line 348 | pmap.o: pmap.c pmap.h pmapparm.h pmaptype.h pmapdata.h
348   ../common/standard.h ../common/copyright.h ../common/rtio.h \
349   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
350   ../common/fvect.h ../common/rterror.h ../common/octree.h \
351 < ../common/object.h ../common/color.h ../common/lookup.h pmapmat.h \
352 < pmapsrc.h source.h pmaprand.h pmapio.h pmapbias.h pmapdiag.h \
353 < ../common/platform.h ../common/otypes.h
351 > ../common/object.h ../common/color.h ../common/paths.h \
352 > ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmapsrc.h source.h pmaprand.h \
353 > pmapio.h pmapbias.h pmapdiag.h ../common/platform.h ../common/otypes.h
354  
355   pmapcontrib.o: pmapcontrib.c pmapcontrib.h pmapdata.h ray.h \
356   ../common/standard.h ../common/copyright.h ../common/rtio.h \
357   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
358   ../common/fvect.h ../common/rterror.h ../common/octree.h \
359   ../common/object.h ../common/color.h pmapparm.h pmaptype.h \
360 < ../common/lookup.h pmap.h pmapmat.h pmapsrc.h source.h pmaprand.h \
361 < pmapio.h pmapdiag.h ../common/platform.h rcontrib.h ../common/paths.h \
360 > ../common/paths.h ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmap.h \
361 > pmapsrc.h source.h pmaprand.h pmapio.h pmapdiag.h ../common/platform.h \
362 > rcontrib.h ../common/rtprocess.h ../common/paths.h func.h \
363 > ../common/calcomp.h ../common/otypes.h
364 >
365 > pmapdata.o: pmapdata.c pmapdata.h ray.h ../common/standard.h \
366 > ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
367 > ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
368 > ../common/rterror.h ../common/octree.h ../common/object.h \
369 > ../common/color.h pmapparm.h pmaptype.h ../common/paths.h \
370 > ../common/lookup.h pmapkdt.h pmapooc.h pmaprand.h pmapmat.h pmap.h \
371 > ../common/otypes.h source.h rcontrib.h ../common/platform.h \
372   ../common/rtprocess.h ../common/paths.h func.h ../common/calcomp.h \
373 < ../common/otypes.h
373 > ../common/random.h pmapkdt.c pmapooc.c
374  
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 –
375   pmapdiag.o: pmapdiag.c pmapdiag.h ../common/platform.h pmapdata.h ray.h \
376   ../common/standard.h ../common/copyright.h ../common/rtio.h \
377   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
# Line 368 | Line 390 | pmapio.o: pmapio.c pmapio.h pmapdata.h ray.h ../common
390   ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
391   ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
392   ../common/rterror.h ../common/octree.h ../common/object.h \
393 < ../common/color.h pmapparm.h pmaptype.h ../common/lookup.h pmapdiag.h \
394 < ../common/platform.h ../common/resolu.h
393 > ../common/color.h pmapparm.h pmaptype.h ../common/paths.h \
394 > ../common/lookup.h pmapkdt.h pmapooc.h pmapdiag.h ../common/platform.h \
395 > ../common/resolu.h
396  
397   pmapmat.o: pmapmat.c pmapmat.h pmap.h pmapparm.h pmaptype.h pmapdata.h \
398   ray.h ../common/standard.h ../common/copyright.h ../common/rtio.h \
399   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
400   ../common/fvect.h ../common/rterror.h ../common/octree.h \
401   ../common/object.h ../common/color.h ../common/lookup.h pmaprand.h \
402 < ../common/otypes.h data.h func.h ../common/calcomp.h ../common/bsdf.h \
403 < ../common/ccolor.h
402 > ../common/otypes.h ../common/data.h func.h ../common/calcomp.h \
403 > ../common/bsdf.h ../common/ccolor.h
404  
405   pmapopt.o: pmapopt.c pmapparm.h pmaptype.h ../common/rtio.h \
406   ../common/rterror.h
# Line 386 | Line 409 | pmapparm.o: pmapparm.c pmapparm.h pmaptype.h pmapdata.
409   ../common/standard.h ../common/copyright.h ../common/rtio.h \
410   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
411   ../common/fvect.h ../common/rterror.h ../common/octree.h \
412 < ../common/object.h ../common/color.h ../common/lookup.h
412 > ../common/object.h ../common/color.h ../common/paths.h \
413 > ../common/lookup.h pmapkdt.h pmapooc.h
414  
415   pmapray.o: pmapray.c pmapray.h ray.h ../common/standard.h \
416   ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
# Line 402 | Line 426 | pmapsrc.o: pmapsrc.c pmapsrc.h ray.h ../common/standar
426   ../common/color.h pmapparm.h pmaptype.h source.h pmap.h pmapdata.h \
427   ../common/lookup.h pmaprand.h ../common/otypes.h
428  
429 + pmutil.o:       pmap.h pmapio.h pmapdata.h pmapparm.h pmaptype.h pmapbias.h \
430 +  ../common/otypes.h
431 +
432   pmaptype.o: pmaptype.c pmaptype.h
433  
434 + mkpmap.o: mkpmap.c pmap.h pmapparm.h pmaptype.h pmapdata.h ray.h \
435 + ../common/standard.h ../common/copyright.h ../common/rtio.h \
436 + ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
437 + ../common/fvect.h ../common/rterror.h ../common/octree.h \
438 + ../common/object.h ../common/color.h ../common/paths.h \
439 + ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmapcontrib.h pmaprand.h \
440 + ambient.h ../common/resolu.h source.h
441 +      
442   oococt.o: oococt.c oococt.h oocsort.h ooccache.h \
443   ../common/rtio.h ../common/fvect.h
444  
# Line 414 | Line 449 | oocsort.o: oocsort.c oocsort.h ../common/fvect.h
449   oocbuild.o: oocbuild.c oocbuild.h oocsort.h oococt.h
450  
451   oocnn.o: oocnn.c oocnn.h oococt.h oocsort.h
452 +
453 + RtraceSimulManager.o rxpmain.o rxtmain.o rxtrace.o:     RtraceSimulManager.h
454 +
455 + RpictSimulManager.o rxpmain.o:  RpictSimulManager.h ../common/view.h \
456 + ../common/depthcodec.h ../common/abitmap.h
457 +
458 + RpictSimulManager.o:    ../common/random.h

Diff Legend

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