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.18 by greg, Wed Dec 15 01:40:11 2010 UTC vs.
Revision 1.21 by schorsch, Thu Mar 10 21:43:23 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 = [
18 < ('findglare', Split('findglare.c glareval.c glaresrc.c setscan.c'),
19 <        ['rtpic','rtargs','rtio','rtproc','rtmath','rtpath','rtmem','rterror']),
20 < ('glarendx',  Split('glarendx.c'), ['rtpic','rtargs','rtio','rtmath']),
21 < ('vwright',   Split('vwright.c'),  ['rtpic','rtargs','rtio','rtmath']),
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],
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 < ('rtcontrib', ['rtcontrib.c', Version],
31 <        ['rtpic','rtargs','rtfunc','rtio','rtproc','rtcont','rtmem','rtpath',
32 <        'rtmath','rtnet','rterror','$RAD_SOCKETLIB']),
31 < ('dctimestep', ['dctimestep.c'],
32 <        ['rtall'])
18 > ('findglare', Split('findglare.c glareval.c glaresrc.c setscan.c'), ['rtrad']),
19 > ('glarendx',  Split('glarendx.c'), ['rtrad']),
20 > ('vwright',   Split('vwright.c'),  ['rtrad']),
21 > ('vwrays',    Split('vwrays.c'),   ['rtrad']),
22 > ('rad',       Split('rad.c'),      ['rtrad']),
23 > ('rpiece',    Split('rpiece.c') + [env.version], ['rtrad']),
24 > ('ranimate',  ['ranimate.c', '$RAD_NETCOMPAT'], ['rtrad', '$RAD_SOCKETLIB']),
25 > ('dctimestep', Split('dctimestep.c')+[cmatrix, cmbsdf], ['rtrad']),
26 > ('rttree_reduce', Split('rttree_reduce.c'), ['rtrad']),
27 > ('rcollate', Split('rcollate.c'), ['rtrad']),
28 > ('eplus_adduvf', Split('eplus_adduvf.c eplus_idf.c'), ['rtrad']),
29 > ('rfluxmtx', Split('rfluxmtx.c'), ['rtrad']),
30 > ('rmtxop', Split('rmtxop.c rmatrix.c')+[cmatrix, cmbsdf], ['rtrad']),
31 > ('wrapBSDF', Split('wrapBSDF.c'), ['rtrad']),
32 > ('evalglare', Split('evalglare.c pictool.c'), ['rtrad', 'reetz']),
33   ]
34  
35   for p in PROGS:
36          prog = env.Program(target=radbin(p[0]), source=p[1], LIBS=p[2]+mlib)
37          progs.append(prog)
38  
39 < #if os.name != 'nt': # XXX pending Windows version of raypcalls.c
40 < if True: # experimental raypwin.c
41 <        # targets with different includes/libs
42 <        rs = Split('ranimove.c ranimove1.c ranimove2.c')
43 <        ranimove = env.Program(target=radbin('ranimove'), source=rs,
44 <                        CPPPATH=env.get('CPPPATH', [])+ ['#src/rt'],
45 <                        LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtmath',
46 <                        'rtcont','rtmem','rtargs','rtio','rtproc','rtpath','rterror']
47 <                        + mlib)
48 <        progs.append(ranimove)
49 <        rsensor = env.Program(target=radbin('rsensor'), source='rsensor.c',
50 <                        CPPPATH=env.get('CPPPATH', [])+ ['#src/rt'],
51 <                        LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtmath',
52 <                        'rtcont','rtmem','rtargs','rtio','rtpath','rterror','rtproc',
53 <                        'rtlamps'] + mlib)
54 <        progs.append(rsensor)
39 > # targets with different includes/libs
40 > rs = Split('ranimove.c ranimove1.c ranimove2.c')
41 > ranimove = env.Program(target=radbin('ranimove'), source=rs,
42 >                CPPPATH=env.get('CPPPATH', [])+ ['#src/rt'],
43 >                LIBS=['raycalls','rttrace','rtrad'] + mlib)
44 > progs.append(ranimove)
45 > rsensor = env.Program(target=radbin('rsensor'), source='rsensor.c',
46 >                CPPPATH=env.get('CPPPATH', [])+ ['#src/rt'],
47 >                LIBS=['raycalls','rttrace','rtrad'] + mlib)
48 > progs.append(rsensor)
49  
50   getinfo = env.Program(target=radbin('getinfo'), source='getinfo.c',
51 <                LIBS=['rtio'])
51 >                LIBS=['rtrad'])
52   progs.append(getinfo)
53  
54  
# Line 65 | Line 59 | if env.has_key('X11LIB'):
59          xglaresrc = env.Program(target=radbin('xglaresrc'),
60                          source=Split('xglaresrc.c') + [env.x11findwind], # XXX remote magic
61                          LIBPATH=xlibp, CPPPATH=xincl,
62 <                        LIBS=['rtpic','rtmath','rtargs','rtio','X11']+ mlib)
62 >                        LIBS=['rtrad', 'X11']+ mlib)
63          progs.append(xglaresrc)
64  
65          # OpenGL targets that also depend on X11
# Line 73 | Line 67 | if env.has_key('X11LIB'):
67                  glrad = env.Program(target=radbin('glrad'), source=Split('glrad.c'),
68                          CPPFLAGS=env.get('CPPFLAGS', []) + ['$RAD_STEREO'],
69                          LIBPATH=xlibp, CPPPATH=xincl,
70 <                        LIBS=['rgl','rtpic','rtscene','rtproc','rtpath','rtargs','rtio',
77 <                        'rtmath','rtcont','rtmem','rterror','rtdummy',
78 <                        'GL', 'GLU','X11'],)
70 >                        LIBS=['rgl','rtrad','rtdummy', 'GL', 'GLU','X11'] + mlib,)
71                  progs.append(glrad)
72  
73   if os.name == 'posix': # XXX ignoring trad.wsh
74 <        for s in Split('''objview objline objpict glare dayfact
75 <                        debugcal rlux raddepend compamb vinfo genambpos fieldcomb'''):
76 <                Default(env.InstallCsh(radbin(s), s + '.csh'))
74 >        for s in Split('''objline glare dayfact
75 >                        debugcal rlux raddepend compamb vinfo fieldcomb'''):
76 >                Default(env.InstallScript(radbin(s), s + '.csh'))
77 >        for s in Split('''objview objpict
78 >                        genambpos genklemsamp genskyvec genBSDF ltview ltpict'''):
79 >                Default(env.InstallScript(radbin(s), s + '.pl'))
80 >        for s in Split('''do_action.tcl do_file.tcl do_options.tcl do_results.tcl
81 >                do_scene.tcl do_views.tcl do_zone.tcl file.hlp getfile.tcl gethelp.tcl
82 >                help.hlp tclIndex trad.hlp trad.icon util.tcl'''):
83 >                Default(env.InstallScript(tclscr(s), s))
84 >        Default(env.InstallTCLScript(radbin('trad'), 'trad.wsh'))
85 >        
86   # Those don't really work yet
87   #else:
88   #       for s in Split('''objview glare rlux '''):
# Line 91 | Line 92 | if os.name == 'posix': # XXX ignoring trad.wsh
92   Default('#src/util')
93   env.Install('$RAD_BINDIR', progs)
94  
95 + # vim: set syntax=python:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines