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

Comparing ray/src/util/SConscript (file contents):
Revision 1.19 by schorsch, Sat Mar 5 00:29:28 2016 UTC vs.
Revision 1.20 by schorsch, Sat Mar 5 13:24:58 2016 UTC

# Line 8 | Line 8 | progs = []
8   # compose paths
9   def radbin(name): return os.path.join('$RAD_BUILDBIN', name)
10   def radlib(name): return os.path.join('$RAD_BUILDLIB', name)
11 + def tclscr(name): return os.path.join('$RAD_BUILDRLIB', 'tcl', name)
12  
13 < Version = env.Object(source='#src/rt/Version.c')
13 > cmatrix = env.Object(source='cmatrix.c')
14 > cmbsdf = env.Object(source='cmbsdf.c')
15  
16   # standard targets
17   PROGS = [
# Line 20 | Line 22 | PROGS = [
22   ('vwrays',    Split('vwrays.c'),   ['rtpic','rtargs','rtio','rtmath']),
23   ('rad',       Split('rad.c'),
24          ['rtpic','rtproc','rtpath','rtmath','rtargs','rtio','rtcont','rtmem','rterror']),
25 < ('rpiece',    Split('rpiece.c') + [Version],
25 > ('rpiece',    Split('rpiece.c') + [env.version], # remote magic
26          ['rtpic','rtargs','rtio','rtproc','rtmath','rtpath','rtmem']),
27   ('ranimate',  ['ranimate.c', '$RAD_NETCOMPAT'],
28          ['rtpic','rtargs','rtio','rtproc','rtcont','rtmem','rtpath','rtmath',
29          'rtnet','rterror','$RAD_SOCKETLIB']),
30 < ('dctimestep', Split('dctimestep.c cmbsdf.c cmatrix.c'),
31 <        ['rtall'])
30 > ('dctimestep', Split('dctimestep.c')+[cmatrix, cmbsdf], ['rtall']),
31 > ('rttree_reduce', Split('rttree_reduce.c'), ['rtall']),
32 > ('rcollate', Split('rcollate.c'), ['rtall']),
33 > ('eplus_adduvf', Split('eplus_adduvf.c eplus_idf.c'), ['rtall']),
34 > ('rfluxmtx', Split('rfluxmtx.c'), ['rtall']),
35 > ('rmtxop', Split('rmtxop.c rmatrix.c')+[cmatrix, cmbsdf], ['rtall']),
36 > ('wrapBSDF', Split('wrapBSDF.c'), ['rtall']),
37 > ('evalglare', Split('evalglare.c pictool.c'), ['rtall', 'reetz']),
38   ]
39  
40   for p in PROGS:
41          prog = env.Program(target=radbin(p[0]), source=p[1], LIBS=p[2]+mlib)
42          progs.append(prog)
43  
44 < #if os.name != 'nt': # XXX pending Windows version of raypcalls.c
45 < if True: # experimental raypwin.c
46 <        # targets with different includes/libs
47 <        rs = Split('ranimove.c ranimove1.c ranimove2.c')
48 <        ranimove = env.Program(target=radbin('ranimove'), source=rs,
49 <                        CPPPATH=env.get('CPPPATH', [])+ ['#src/rt'],
50 <                        LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtmath',
51 <                        'rtnet','rtcont','rtmem','rtargs','rtio','rtproc','rtpath','rterror']
52 <                        + mlib)
53 <        progs.append(ranimove)
54 <        rsensor = env.Program(target=radbin('rsensor'), source='rsensor.c',
55 <                        CPPPATH=env.get('CPPPATH', [])+ ['#src/rt'],
56 <                        LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtmath',
57 <                        'rtcont','rtmem','rtargs','rtio','rtpath','rterror','rtproc',
50 <                        'rtnet','rtlamps'] + mlib)
51 <        progs.append(rsensor)
44 > # targets with different includes/libs
45 > rs = Split('ranimove.c ranimove1.c ranimove2.c')
46 > ranimove = env.Program(target=radbin('ranimove'), source=rs,
47 >                CPPPATH=env.get('CPPPATH', [])+ ['#src/rt'],
48 >                LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtmath',
49 >                'rtnet','rtcont','rtmem','rtargs','rtio','rtproc','rtpath','rterror']
50 >                + mlib)
51 > progs.append(ranimove)
52 > rsensor = env.Program(target=radbin('rsensor'), source='rsensor.c',
53 >                CPPPATH=env.get('CPPPATH', [])+ ['#src/rt'],
54 >                LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtmath',
55 >                'rtcont','rtmem','rtargs','rtio','rtpath','rterror','rtproc',
56 >                'rtnet','rtlamps'] + mlib)
57 > progs.append(rsensor)
58  
59   getinfo = env.Program(target=radbin('getinfo'), source='getinfo.c',
60                  LIBS=['rtio'])
# Line 76 | Line 82 | if env.has_key('X11LIB'):
82                  progs.append(glrad)
83  
84   if os.name == 'posix': # XXX ignoring trad.wsh
85 <        for s in Split('''objview objline objpict glare dayfact
86 <                        debugcal rlux raddepend compamb vinfo genambpos fieldcomb'''):
85 >        for s in Split('''objline glare dayfact
86 >                        debugcal rlux raddepend compamb vinfo fieldcomb'''):
87                  Default(env.InstallScript(radbin(s), s + '.csh'))
88 +        for s in Split('''objview objpict
89 +                        genambpos genklemsamp genskyvec genBSDF ltview ltpict'''):
90 +                Default(env.InstallScript(radbin(s), s + '.pl'))
91 +        for s in Split('''do_action.tcl do_file.tcl do_options.tcl do_results.tcl
92 +                do_scene.tcl do_views.tcl do_zone.tcl file.hlp getfile.tcl gethelp.tcl
93 +                help.hlp tclIndex trad.hlp trad.icon util.tcl'''):
94 +                Default(env.InstallScript(tclscr(s), s))
95 +        Default(env.InstallTCLScript(radbin('trad'), 'trad.wsh'))
96 +        
97   # Those don't really work yet
98   #else:
99   #       for s in Split('''objview glare rlux '''):
# Line 88 | Line 103 | if os.name == 'posix': # XXX ignoring trad.wsh
103   Default('#src/util')
104   env.Install('$RAD_BINDIR', progs)
105  
106 + # vim: set syntax=python:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines