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

Comparing ray/src/hd/SConscript (file contents):
Revision 1.4 by schorsch, Mon Nov 8 19:24:46 2004 UTC vs.
Revision 1.6 by schorsch, Mon Apr 21 07:31:29 2008 UTC

# Line 9 | Line 9 | mlib = env['RAD_MLIB']
9   viewbeams = env.Object(source='viewbeams.c')
10   holo = env.Object(source='holo.c')
11   holofile = env.Object(source='holofile.c')
12 + clumpbeams = env.Object(source='clumpbeams.c')
13   Version = env.Object(source='../rt/Version.c') # XXX ../rt/not_nice
14  
15  
# Line 16 | Line 17 | Version = env.Object(source='../rt/Version.c') # XXX .
17   PROGS = (
18   ('rholo', Split('''rholo.c rholo2.c rholo2l.c rholo3.c rholo4.c''')
19           + [Version, holofile, holo, viewbeams],
20 <        ['rtpic','rtio','rtproc','rtpath','rtargs','rtmath','rtmem','rterror']),
20 >        ['rtpic','rtproc','rtpath','rtio','rtargs','rtmath','rtmem','rterror']),
21   ('rhpict', Split('rhpict.c rhpict2.c')+[Version, holofile, holo, viewbeams],
22 <        ['rtpic','rtio','rtproc','rtargs','rtmath','rtmem','rterror']),
23 < ('rhcopy', Split('rhcopy.c clumpbeams.c') + [holofile, holo],
24 <        ['rtpic','rtio','rtproc','rtargs','rtmath','rtmem','rterror']),
22 >        ['rtpic','rtproc','rtargs','rtio','rtmath','rtmem','rterror']),
23 > ('rhcopy', Split('rhcopy.c') + [clumpbeams, holofile, holo],
24 >        ['rtpic','rtproc','rtargs','rtio','rtmath','rtmem','rterror']),
25   ('rhinfo', Split('rhinfo.c') + [holofile, holo],
26          ['rtio','rtproc', 'rtmath','rterror']),
27 + ('rhoptimize', Split('rhoptimize.c') + [clumpbeams, holofile, holo],
28 +        ['rtio','rtproc', 'rtmath','rterror']),
29   ('genrhgrid', Split('genrhgrid.c') + [holofile, holo],
30   ['rtio','rtmath','rtproc','rterror']),
31   )
# Line 50 | Line 53 | if env.has_key('X11INCLUDE'):
53          # XXX the .hdi extension will cause problems on Windows
54          xenv['PROGSUFFIX'] = '.hdi'
55  
56 <        dlibs = ['rtpic','rtio','rtmath','rtcont','rtmem','rtargs','rterror']
56 >        dlibs = ['rtpic','rtmath','rtcont','rtmem','rtargs','rtio','rterror']
57          def make_hdi(p): # build them
58                  obj = xenv.Object(target=p[3], source=p[4], CPPFLAGS=ocppflags + p[5])
59                  prog = xenv.Program(target=os.path.join(devdir, p[0]),

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines