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.7 by schorsch, Tue Dec 23 15:04:00 2008 UTC vs.
Revision 1.8 by schorsch, Sat Mar 5 13:24:58 2016 UTC

# Line 5 | Line 5 | Import('env')
5   # math libs
6   mlib = env['RAD_MLIB']
7  
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 +
12   # common objects
13   viewbeams = env.Object(source='viewbeams.c')
14   holo = env.Object(source='holo.c')
15   holofile = env.Object(source='holofile.c')
16   clumpbeams = env.Object(source='clumpbeams.c')
13 Version = env.Object(source='../rt/Version.c') # XXX ../rt/not_nice
17  
15
18   # standard targets
19   PROGS = (
20   ('rholo', Split('''rholo.c rholo2.c rholo2l.c rholo3.c rholo4.c''')
21 <         + [Version, holofile, holo, viewbeams],
21 >         + [env.version, holofile, holo, viewbeams],
22          ['rtpic','rtproc','rtpath','rtio','rtargs','rtmath','rtmem','rterror']),
23 < ('rhpict', Split('rhpict.c rhpict2.c')+[Version, holofile, holo, viewbeams],
23 > ('rhpict', Split('rhpict.c rhpict2.c')+[env.version, holofile, holo, viewbeams],
24          ['rtpic','rtproc','rtargs','rtio','rtmath','rtmem','rterror']),
25   ('rhcopy', Split('rhcopy.c') + [clumpbeams, holofile, holo],
26          ['rtpic','rtproc','rtargs','rtio','rtmath','rtmem','rterror']),
# Line 31 | Line 33 | PROGS = (
33   )
34   if os.name != 'nt': # pending some major work...
35          for p in PROGS:
36 <                prog = env.Program(target=os.path.join(env['RAD_BUILDBIN'], p[0]),
36 >                prog = env.Program(target=radbin(p[0]),
37                                  source=p[1], LIBS=p[2] + mlib)
38                  Default(prog)
39                  env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], prog)])
# Line 56 | Line 58 | if env.has_key('X11INCLUDE'):
58          dlibs = ['rtpic','rtmath','rtcont','rtmem','rtargs','rtio','rterror','rtdummy']
59          def make_hdi(p): # build them
60                  obj = xenv.Object(target=p[3], source=p[4], CPPFLAGS=ocppflags + p[5])
61 <                prog = xenv.Program(target=os.path.join(devdir, p[0]),
61 >                prog = xenv.Program(target=radbin(p[0]),
62                                  source=[obj] + p[1] + xcommon, LIBS=p[2])
63                  Default(prog)
64                  inst = xenv.Install(idevdir, prog)
65                  # XXX what are the alternative "<driver>h" names good for?
66 <                insth = xenv.InstallAs(target=os.path.join(idevdir,
66 >                insth = xenv.InstallAs(target=radbin(
67                                          p[0] + 'h' + xenv['PROGSUFFIX']), source=prog)
68                  env.Append(RAD_BININSTALL=[inst, insth])
69  
# Line 115 | Line 117 | if env.has_key('X11INCLUDE'):
117  
118  
119  
120 + # vim: set syntax=python:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines