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.63 by greg, Fri Feb 18 02:41:55 2011 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
16   LINTFLAGS = -DBSD
# Line 54 | Line 57 | RPSRC = rpmain.c rpict.c srcdraw.c duphead.c persist.c
57   RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS)
58   RVSRC = rvmain.c rview.c rv2.c rv3.c $(DSRC)
59  
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  
69   ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
70 <        $(MODOBJS) $(SUPPOBJS)
70 >        $(MODOBJS) $(SUPPOBJS) $(PMOBJS)
71   RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \
72          $(MODSRC) $(SUPPSRC)
73  
# Line 73 | Line 82 | SURFSRC = sphere.c source.c srcobstr.c srcsupp.c srcsa
82          o_face.c srcsamp.c o_cone.c o_instance.c o_mesh.c
83  
84   MATOBJS = aniso.o normal.o dielectric.o m_clip.o glass.o m_brdf.o \
85 <        m_mirror.o m_direct.o m_mist.o fprism.o m_alias.o m_bsdf.o
85 >        m_mirror.o m_direct.o m_mist.o fprism.o m_alias.o m_bsdf.o \
86 >        ashikhmin.o
87   MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.c m_brdf.c \
88 <        m_mirror.c m_direct.c m_mist.c fprism.c m_alias.c m_bsdf.c
88 >        m_mirror.c m_direct.c m_mist.c fprism.c m_alias.c m_bsdf.c \
89 >        ashikhmin.c
90  
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
# Line 83 | Line 94 | MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx
94   SUPPOBJS = func.o noise3.o data.o
95   SUPPSRC = func.c noise3.c data.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 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 pmutil.c pmcontrib2.c
105 +
106   HEADERS = ambient.h ray.h data.h otspecial.h source.h
107  
108   #
109   # What this makefile produces:
110   #
111  
112 < PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/lookamb
112 > PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/rcontrib \
113 > $(DESTDIR)/lookamb $(DESTDIR)/mkpmap $(DESTDIR)/pmapdump
114  
115   all:    $(PROGS) $(RCLIB) $(SPECIAL)
116  
117   install:        all rayinit.cal
118          $(INSTALL) $(PROGS) $(INSTDIR)
98 –        cd $(INSTDIR) ; rm -f rview ; ln -s rvu rview
119          rm -f $(LIBDIR)/rayinit.cal
120          cp rayinit.cal $(LIBDIR)
121  
122   ogl:    
123  
124   clean:
125 <        set nonomatch; rm -f $(PROGS) *.o core
125 >        set nonomatch; rm -f $(PROGS) *.o
126  
127   lint:   $(RVSRC)
128          $(LINT) $(LINTFLAGS) -DRVIEW $(RVSRC) $(LIBS)
# Line 121 | Line 141 | $(DESTDIR)/rvu:        $(RVOBJS) $(RCLIB) $(RLIB)
141          $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RCLIB) \
142   $(RLIB) $(LIBS) $(DLIBS)
143  
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  
154 + $(DESTDIR)/mkpmap: mkpmap.o $(RLIB)
155 +        $(CC) $(CFLAGS) -o $(DESTDIR)/mkpmap mkpmap.o $(RLIB) $(LIBS)
156 +
157 + $(DESTDIR)/pmapdump: pmapdump.o pmaptype.o pmapparm.o
158 +        $(CC) $(CFLAGS) -o pmapdump pmapdump.o pmaptype.o pmapparm.o $(LIBS)
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 151 | 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 175 | Line 208 | rtrace.o rvmain.o rv2.o rv3.o: ../common/octree.h
208  
209   o_instance.o:   ../common/instance.h
210  
211 < ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o initotypes.o \
212 < 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
211 > ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o glass.o \
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 normal.o raycalls.o raytrace.o rpict.o \
217 < rvmain.o rtmain.o rpmain.o persist.o source.o rv3.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  
220 < ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o m_bsdf.o \
221 < m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o o_mesh.o \
222 < mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \
220 > ambcomp.o ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o \
221 > glass.o m_bsdf.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o \
222 > o_mesh.o mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \
223   raycalls.o raypcalls.o rayfifo.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
224   source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \
225 < text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o: ray.h \
225 > text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o rcmain.o \
226 > rcontrib.o rc2.o rc3.o: ray.h \
227   ../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \
228   ../common/rterror.h ../common/octree.h \
229   ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
# Line 197 | Line 231 | text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o
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 \
# Line 207 | Line 241 | duphead.o octree.o:    ../common/standard.h ../common/rtm
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
251  
252 + rpict.o:        ../common/hilbert.h
253 +
254   x11.o x11twind.o: x11twind.h
255  
256   x11.o:  x11icon.h
# Line 239 | Line 278 | o_mesh.o:      ../common/mesh.h
278  
279   noise3.o:       ../common/calcomp.h
280  
281 < aniso.o dielectric.o freeobjmem.o glass.o initotypes.o \
281 > aniso.o ashikhmin.o dielectric.o freeobjmem.o glass.o initotypes.o \
282   m_alias.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o \
283   mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
284   o_mesh.o p_data.o p_func.o source.o sphere.o t_data.o t_func.o \
# Line 247 | Line 286 | srcobstr.o text.o:             rtotypes.h
286  
287   m_bsdf.o:       ambient.h source.h func.h \
288   ../common/calcomp.h ../common/bsdf.h ../common/random.h
289 +
290 + 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:     ambient.h
295 +
296 + rcmain.o:       source.h
297 +
298 + rcontrib.o:     source.h ../common/otypes.h
299 +
300 + rc2.o:  ../common/resolu.h
301 +
302 + rc3.o:  ../common/selcall.h
303 +
304 + #
305 + # Photon map include dependencies (via 'gcc -MM -I../common')
306 + #
307 + ambient.o: pmapparm.h pmaptype.h pmapamb.h pmapdata.h
308 +
309 + dielectric.o glass.o normal.o m_brdf.o m_bsdf.o ashikhmin.o aniso.o: \
310 +   pmapparm.h pmaptype.h pmapmat.h pmap.h pmapdata.h
311 +  
312 + raycalls.o rpmain.o rcmain.o rtmain.o rvmain.o: \
313 +   pmapparm.h pmaptype.h pmapray.h
314 +  
315 + rcmain.o: pmapparm.h pmaptype.h pmapray.h pmapcontrib.h pmapdata.h
316 +  
317 + raytrace.o: pmapparm.h pmaptype.h pmap.h pmapdata.h
318 +
319 + renderopts.o: pmapparm.h pmaptype.h pmapopt.h
320 +
321 + rpict.o: pmapparm.h pmaptype.h pmapbias.h pmapdata.h pmapdiag.h
322 +
323 + source.o: pmapparm.h pmaptype.h pmap.h pmapdata.h pmapsrc.h
324 +
325 + pmapamb.o: pmapamb.c pmapamb.h pmapdata.h ray.h ../common/standard.h \
326 + ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
327 + ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
328 + ../common/rterror.h ../common/octree.h ../common/object.h \
329 + ../common/color.h pmapparm.h pmaptype.h ../common/lookup.h pmap.h
330 +
331 + pmapbias.o: pmapbias.c pmapbias.h pmapdata.h ray.h ../common/standard.h \
332 + ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
333 + ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
334 + ../common/rterror.h ../common/octree.h ../common/object.h \
335 + ../common/color.h pmapparm.h pmaptype.h ../common/lookup.h pmap.h \
336 + pmaprand.h
337 +
338 + pmap.o: pmap.c pmap.h pmapparm.h pmaptype.h pmapdata.h ray.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/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/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/random.h pmapkdt.c pmapooc.c
365 +
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 \
369 + ../common/fvect.h ../common/rterror.h ../common/octree.h \
370 + ../common/object.h ../common/color.h pmapparm.h pmaptype.h \
371 + ../common/lookup.h
372 +
373 + pmapdump.o: pmapdump.c pmapio.h pmapdata.h ray.h ../common/standard.h \
374 + ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
375 + ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
376 + ../common/rterror.h ../common/octree.h ../common/object.h \
377 + ../common/color.h pmapparm.h pmaptype.h ../common/lookup.h \
378 + ../common/rtio.h ../common/resolu.h
379 +
380 + pmapio.o: pmapio.c pmapio.h pmapdata.h ray.h ../common/standard.h \
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/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
395 +
396 + pmapopt.o: pmapopt.c pmapparm.h pmaptype.h ../common/rtio.h \
397 + ../common/rterror.h
398 +
399 + pmapparm.o: pmapparm.c pmapparm.h pmaptype.h pmapdata.h ray.h \
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/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 \
408 + ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
409 + ../common/rterror.h ../common/octree.h ../common/object.h \
410 + ../common/color.h pmapparm.h pmaptype.h pmap.h pmapdata.h \
411 + ../common/lookup.h
412 +
413 + pmapsrc.o: pmapsrc.c pmapsrc.h ray.h ../common/standard.h \
414 + ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
415 + ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
416 + ../common/rterror.h ../common/octree.h ../common/object.h \
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 +
436 + ooccache.o: ooccache.c ooccache.h
437 +
438 + oocsort.o: oocsort.c oocsort.h ../common/fvect.h
439 +
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