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.6 by schorsch, Mon Apr 21 07:31:29 2008 UTC vs.
Revision 1.9 by schorsch, Thu Mar 10 01:49:56 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],
22 <        ['rtpic','rtproc','rtpath','rtio','rtargs','rtmath','rtmem','rterror']),
23 < ('rhpict', Split('rhpict.c rhpict2.c')+[Version, holofile, holo, viewbeams],
24 <        ['rtpic','rtproc','rtargs','rtio','rtmath','rtmem','rterror']),
21 >         + [env.version, holofile, holo, viewbeams],
22 >        ['rtpic','rtproc','rtpath','rtio','rtargs','rtmath','rtmem','rterror'],0),
23 > ('rhpict', Split('rhpict.c rhpict2.c')+[env.version, holofile, holo, viewbeams],
24 >        ['rtpic','rtproc','rtargs','rtio','rtmath','rtmem','rterror'],1),
25   ('rhcopy', Split('rhcopy.c') + [clumpbeams, holofile, holo],
26 <        ['rtpic','rtproc','rtargs','rtio','rtmath','rtmem','rterror']),
26 >        ['rtpic','rtproc','rtargs','rtio','rtmath','rtmem','rterror'],1),
27   ('rhinfo', Split('rhinfo.c') + [holofile, holo],
28 <        ['rtio','rtproc', 'rtmath','rterror']),
28 >        ['rtio','rtproc', 'rtmath','rterror'],1),
29   ('rhoptimize', Split('rhoptimize.c') + [clumpbeams, holofile, holo],
30 <        ['rtio','rtproc', 'rtmath','rterror']),
30 >        ['rtio','rtproc', 'rtmath','rterror'],1),
31   ('genrhgrid', Split('genrhgrid.c') + [holofile, holo],
32 < ['rtio','rtmath','rtproc','rterror']),
32 > ['rtio','rtmath','rtproc','rterror'],1),
33   )
34 < if os.name != 'nt': # pending some major work...
34 > if 1:
35          for p in PROGS:
36 <                prog = env.Program(target=os.path.join(env['RAD_BUILDBIN'], p[0]),
36 >                print(p[0])
37 >                if not p[3] and os.name == 'nt': continue
38 >                prog = env.Program(target=radbin(p[0]),
39                                  source=p[1], LIBS=p[2] + mlib)
40                  Default(prog)
41                  env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], prog)])
42  
43   # display drivers
44   if env.has_key('X11INCLUDE'):
45 <        xenv = env.Copy(CPPPATH=[env['X11INCLUDE']] + env['CPPPATH'],
45 >        xenv = env.Clone(CPPPATH=[env['X11INCLUDE']] + env['CPPPATH'],
46                          LIBPATH=[env['X11LIB']] + env['LIBPATH'],)
47          # common objects
48          rhdisp = xenv.Object(source='rhdisp.c')
# Line 53 | Line 57 | if env.has_key('X11INCLUDE'):
57          # XXX the .hdi extension will cause problems on Windows
58          xenv['PROGSUFFIX'] = '.hdi'
59  
60 <        dlibs = ['rtpic','rtmath','rtcont','rtmem','rtargs','rtio','rterror']
60 >        dlibs = ['rtpic','rtmath','rtcont','rtmem','rtargs','rtio','rterror','rtdummy']
61          def make_hdi(p): # build them
62                  obj = xenv.Object(target=p[3], source=p[4], CPPFLAGS=ocppflags + p[5])
63 <                prog = xenv.Program(target=os.path.join(devdir, p[0]),
63 >                prog = xenv.Program(target=radbin(p[0]),
64                                  source=[obj] + p[1] + xcommon, LIBS=p[2])
65                  Default(prog)
66                  inst = xenv.Install(idevdir, prog)
67                  # XXX what are the alternative "<driver>h" names good for?
68 <                insth = xenv.InstallAs(target=os.path.join(idevdir,
68 >                insth = xenv.InstallAs(target=radbin(
69                                          p[0] + 'h' + xenv['PROGSUFFIX']), source=prog)
70                  env.Append(RAD_BININSTALL=[inst, insth])
71  
# Line 115 | Line 119 | if env.has_key('X11INCLUDE'):
119  
120  
121  
122 + # vim: set syntax=python:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines