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.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
16   LINTFLAGS = -DBSD
# Line 57 | 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 85 | 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 \
99           pmapdiag.o pmaptype.o oocmorton.o oococt.o oocsort.o oocbuild.o \
100 <         oocnn.o ooccache.o
100 >         oocnn.o ooccache.o pmutil.o pmcontrib2.o
101   PMSRC = pmap.c pmapsrc.c pmapmat.c pmaprand.c pmapio.c pmapdata.c \
102          pmapbias.c pmapparm.c pmapcontrib.c pmapamb.c pmapray.c pmapopt.c \
103          pmapdiag.c pmaptype.c pmapkdt.c pmapooc.c oocmorton.c oococt.c \
104 <        oocsort.c oocbuild.c oocnn.c ooccache.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 110 | Line 116 | all:   $(PROGS) $(RCLIB) $(SPECIAL)
116  
117   install:        all rayinit.cal
118          $(INSTALL) $(PROGS) $(INSTDIR)
113 –        cd $(INSTDIR) ; rm -f rview ; ln -s rvu rview
114 –        cd $(INSTDIR) ; rm -f rtcontrib ; ln -s rcontrib rtcontrib
119          rm -f $(LIBDIR)/rayinit.cal
120          cp rayinit.cal $(LIBDIR)
121  
# Line 140 | 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 151 | Line 159 | $(DESTDIR)/pmapdump: pmapdump.o pmaptype.o pmapparm.o
159  
160   $(RLIB):        $(ROBJS) Version.o
161          rm -f $(RLIB)
162 <        ar rc $(RLIB) $(ROBJS) Version.o
162 >        $(AR) rc $(RLIB) $(ROBJS) Version.o
163          -ranlib $(RLIB)
164  
165   $(RCLIB):       $(RLOBJS)
166          rm -f $(RCLIB)
167 <        ar rc $(RCLIB) $(RLOBJS)
167 >        $(AR) rc $(RCLIB) $(RLOBJS)
168          -ranlib $(RCLIB)
169  
170   #
# Line 176 | 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 201 | Line 209 | rtrace.o rvmain.o rv2.o rv3.o: ../common/octree.h
209   o_instance.o:   ../common/instance.h
210  
211   ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o glass.o \
212 < initotypes.o m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o preload.o \
213 < raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \
214 < srcdraw.o srcobstr.o virtuals.o:        ../common/otypes.h
212 > initotypes.o m_brdf.o m_bsdf.o m_direct.o m_mirror.o normal.o o_cone.o \
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 223 | 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 < 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 246 | 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 280 | 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 < 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 326 | Line 339 | pmap.o: pmap.c pmap.h pmapparm.h pmaptype.h pmapdata.h
339   ../common/standard.h ../common/copyright.h ../common/rtio.h \
340   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
341   ../common/fvect.h ../common/rterror.h ../common/octree.h \
342 < ../common/object.h ../common/color.h ../common/lookup.h pmapmat.h \
343 < pmapsrc.h source.h pmaprand.h pmapio.h pmapbias.h pmapdiag.h \
344 < ../common/platform.h ../common/otypes.h
342 > ../common/object.h ../common/color.h ../common/paths.h \
343 > ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmapsrc.h source.h pmaprand.h \
344 > pmapio.h pmapbias.h pmapdiag.h ../common/platform.h ../common/otypes.h
345  
346   pmapcontrib.o: pmapcontrib.c pmapcontrib.h pmapdata.h ray.h \
347   ../common/standard.h ../common/copyright.h ../common/rtio.h \
348   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
349   ../common/fvect.h ../common/rterror.h ../common/octree.h \
350   ../common/object.h ../common/color.h pmapparm.h pmaptype.h \
351 < ../common/lookup.h pmap.h pmapmat.h pmapsrc.h source.h pmaprand.h \
352 < pmapio.h pmapdiag.h ../common/platform.h rcontrib.h ../common/paths.h \
351 > ../common/paths.h ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmap.h \
352 > pmapsrc.h source.h pmaprand.h pmapio.h pmapdiag.h ../common/platform.h \
353 > rcontrib.h ../common/rtprocess.h ../common/paths.h func.h \
354 > ../common/calcomp.h ../common/otypes.h
355 >
356 > pmapdata.o: pmapdata.c pmapdata.h ray.h ../common/standard.h \
357 > ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
358 > ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
359 > ../common/rterror.h ../common/octree.h ../common/object.h \
360 > ../common/color.h pmapparm.h pmaptype.h ../common/paths.h \
361 > ../common/lookup.h pmapkdt.h pmapooc.h pmaprand.h pmapmat.h pmap.h \
362 > ../common/otypes.h source.h rcontrib.h ../common/platform.h \
363   ../common/rtprocess.h ../common/paths.h func.h ../common/calcomp.h \
364 < ../common/otypes.h
364 > ../common/random.h pmapkdt.c pmapooc.c
365  
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 –
366   pmapdiag.o: pmapdiag.c pmapdiag.h ../common/platform.h pmapdata.h ray.h \
367   ../common/standard.h ../common/copyright.h ../common/rtio.h \
368   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
# Line 368 | Line 381 | pmapio.o: pmapio.c pmapio.h pmapdata.h ray.h ../common
381   ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
382   ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
383   ../common/rterror.h ../common/octree.h ../common/object.h \
384 < ../common/color.h pmapparm.h pmaptype.h ../common/lookup.h pmapdiag.h \
385 < ../common/platform.h ../common/resolu.h
384 > ../common/color.h pmapparm.h pmaptype.h ../common/paths.h \
385 > ../common/lookup.h pmapkdt.h pmapooc.h pmapdiag.h ../common/platform.h \
386 > ../common/resolu.h
387  
388   pmapmat.o: pmapmat.c pmapmat.h pmap.h pmapparm.h pmaptype.h pmapdata.h \
389   ray.h ../common/standard.h ../common/copyright.h ../common/rtio.h \
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 386 | Line 400 | pmapparm.o: pmapparm.c pmapparm.h pmaptype.h pmapdata.
400   ../common/standard.h ../common/copyright.h ../common/rtio.h \
401   ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
402   ../common/fvect.h ../common/rterror.h ../common/octree.h \
403 < ../common/object.h ../common/color.h ../common/lookup.h
403 > ../common/object.h ../common/color.h ../common/paths.h \
404 > ../common/lookup.h pmapkdt.h pmapooc.h
405  
406   pmapray.o: pmapray.c pmapray.h ray.h ../common/standard.h \
407   ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
# Line 402 | Line 417 | pmapsrc.o: pmapsrc.c pmapsrc.h ray.h ../common/standar
417   ../common/color.h pmapparm.h pmaptype.h source.h pmap.h pmapdata.h \
418   ../common/lookup.h pmaprand.h ../common/otypes.h
419  
420 + pmutil.o:       pmap.h pmapio.h pmapdata.h pmapparm.h pmaptype.h pmapbias.h \
421 +  ../common/otypes.h
422 +
423   pmaptype.o: pmaptype.c pmaptype.h
424  
425 + mkpmap.o: mkpmap.c pmap.h pmapparm.h pmaptype.h pmapdata.h ray.h \
426 + ../common/standard.h ../common/copyright.h ../common/rtio.h \
427 + ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
428 + ../common/fvect.h ../common/rterror.h ../common/octree.h \
429 + ../common/object.h ../common/color.h ../common/paths.h \
430 + ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmapcontrib.h pmaprand.h \
431 + ambient.h ../common/resolu.h source.h
432 +      
433   oococt.o: oococt.c oococt.h oocsort.h ooccache.h \
434   ../common/rtio.h ../common/fvect.h
435  
# Line 414 | 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