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.20 by schorsch, Sat Mar 5 13:24:58 2016 UTC vs.
Revision 1.21 by schorsch, Thu Mar 10 21:43:23 2016 UTC

# Line 15 | Line 15 | 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') + [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')+[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']),
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:
# Line 45 | Line 40 | for p in PROGS:
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','rtscene','rtpic','rtfunc','rtmath',
49 <                'rtnet','rtcont','rtmem','rtargs','rtio','rtproc','rtpath','rterror']
50 <                + mlib)
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','rtscene','rtpic','rtfunc','rtmath',
55 <                'rtcont','rtmem','rtargs','rtio','rtpath','rterror','rtproc',
56 <                'rtnet','rtlamps'] + mlib)
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 68 | 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 76 | 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',
80 <                        'rtmath','rtcont','rtmem','rterror','rtdummy',
81 <                        'GL', 'GLU','X11'] + mlib,)
70 >                        LIBS=['rgl','rtrad','rtdummy', 'GL', 'GLU','X11'] + mlib,)
71                  progs.append(glrad)
72  
73   if os.name == 'posix': # XXX ignoring trad.wsh

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines