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

Comparing ray/src/rt/SConscript (file contents):
Revision 1.17 by schorsch, Thu Mar 10 21:43:23 2016 UTC vs.
Revision 1.19 by schorsch, Mon Jan 8 13:38:37 2018 UTC

# Line 1 | Line 1
1 + from __future__ import division, print_function, unicode_literals
2 +
3   import os
4   from build_utils import vstamp
5  
# Line 27 | Line 29 | pmapparm = env.Object(source="pmapparm.c")
29   RAY = Split('''ambcomp.c ambient.c freeobjmem.c initotypes.c preload.c
30                  raytrace.c renderopts.c''') + [ambio]
31   PMAP = Split('''pmap.c pmapsrc.c pmapmat.c pmaprand.c pmapio.c pmapdata.c
32 <        pmapbias.c pmapcontrib.c pmapamb.c pmapray.c pmapopt.c pmapdiag.c '''
33 <                ) + [pmaptype, pmapparm]
32 >        pmapbias.c pmapcontrib.c pmapamb.c pmapray.c pmapopt.c pmapdiag.c
33 >                oocbuild.c ooccache.c oocnn.c oocmorton.c oococt.c oocsort.c
34 >                pmcontrib2.c pmapkdt.c pmutil.c
35 >                ''') + [pmaptype, pmapparm]
36 > # not ready yet: pmapooc.c
37   SURF = Split('''srcsamp.c srcsupp.c srcobstr.c source.c virtuals.c sphere.c
38                  o_face.c o_cone.c o_instance.c o_mesh.c''')
39   MAT = Split('''aniso.c normal.c m_clip.c glass.c m_brdf.c m_mirror.c
# Line 43 | Line 48 | env.Command('Version.c', 'VERSION', vstamp.build_versi
48   env.Depends('Version.c', rsrc)
49   Version = env.Object(source=['Version.c'])
50   env.version = Version # make it remotely accessible
51 < rlib = env.Library(target=radlib('rttrace'), source=rsrc + [Version])
51 > tracelib = env.Library(target=radlib('rttrace'), source=rsrc + [Version])
52  
53   rclib = env.Library(target=radlib('raycalls'),
54                  source=Split('raycalls.c $RAD_PCALLS'))
# Line 71 | Line 76 | for p in PROGS:
76          Default(prog)
77          env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', prog)])
78  
79 + # we need RVOBJS for any derived viewers, such as winrview
80 + if os.name == 'nt': RV_DEF = ['WIN_RVIEW']
81 + else: RV_DEF = []
82 + rvmain = env.Object(source='rvmain.c',
83 +                CCFLAGS=env['CCFLAGS'] + ['-DNICE=6'])
84 + rvobjs = [rvmain]
85 + for src in  Split('''rview.c rv2.c rv3.c
86 +        devtable.c devcomm.c colortab.c editline.c'''):
87 +        rvobjs.append(env.Object(source=src,
88 +                        CPPDEFINES=env.get('CPPDEFINES', []) + RV_DEF))
89 + env['RVOBJS'] = rvobjs
90  
91   if env.has_key('X11LIB'): # lots of special requirements for rvu
92          x11incls = [env['X11INCLUDE']] + env['CPPPATH']
93          x11 = env.Object(source='x11.c', CPPPATH=x11incls)
94          x11twind = env.Object(source='x11twind.c', CPPPATH=x11incls)
95 <        rvmain = env.Object(source='rvmain.c',
96 <                CCFLAGS=env['CCFLAGS'] + ['-DNICE=6'])
81 <        rv3 = env.Object(source='rv3.c',
82 <                CCFLAGS=env['CCFLAGS']
83 <                )
84 <
85 <        devsrc  = Split('devtable.c devcomm.c colortab.c editline.c')
86 <        rvobjs = [x11, x11twind, rv3, rvmain, rlib]
87 <        rvsrc = Split('rview.c rv2.c') + devsrc + rvobjs
95 >        rvxobjs = [x11, x11twind]
96 >        rvsrc =  rvobjs + rvxobjs
97          rvu = env.Program(target=radbin('rvu'), source=rvsrc,
98                  LIBPATH=env['LIBPATH'] + [env['X11LIB']],
99                  LIBS = ([rclib, 'rttrace', 'rtrad', 'X11'] + mlib)
# Line 96 | Line 105 | LIBFILES = Split('rayinit.cal')
105   env.Append(RAD_RLIBINSTALL=[env.Install('$RAD_RLIBDIR', LIBFILES)])
106  
107   # vim: set syntax=python:
108 + # vi: set ts=4 sw=4 :

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines