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

Comparing ray/src/gen/SConscript (file contents):
Revision 1.6 by schorsch, Mon Sep 12 14:44:09 2005 UTC vs.
Revision 1.13 by greg, Wed Dec 15 01:40:11 2010 UTC

# Line 8 | Line 8 | mlib = env['RAD_MLIB']
8   # standard targets
9   PROGS = (
10   # name          sources           libs
11 + ('gendaylit',   Split('gendaylit.c sun.c',), ['rtlamps']),
12   ('genbeads',    Split('genbeads.c hermite3.c'),  []),
13   ('genbox',      ['genbox.c',],    []),
14   ('genmarble',   ['genmarble.c',], []),
# Line 24 | Line 25 | PROGS = (
25   ('genbranch',   ['genbranch.c',], []),
26   ('replmarks',   ['replmarks.c',],
27          ['rtproc','rtpath','rtmath','rtio','rterror']),
28 < ('mkillum',     Split('mkillum.c mkillum2.c mkillum3.c'),
29 <    ['rtproc','rtscene','rtpath','rtmath','rtio','rtcont','rterror']),
28 > #('mkillum',     Split('mkillum.c mkillum2.c mkillum3.c'),
29 > #    ['rtproc','rtscene','rtpath','rtmath','rtio','rtcont','rterror']),
30 > #('mksource',    ['mksource.c'],
31 > #       ['rtio','rtmath','rterror']),
32   ('xform',       ['xform.c',],
33      ['rtproc','rtscene','rtmath','rtargs','rtio','rtcont','rtpath','rterror']),
34   )
35   progs = []
36   for p in PROGS:
37 <    prog = env.Program(target=os.path.join(env['RAD_BUILDBIN'], p[0]),
37 >    prog = env.Program(target=os.path.join('$RAD_BUILDBIN', p[0]),
38              source=p[1], LIBS=p[2] + mlib)
39      progs.append(prog)
40  
41 + prog = env.Program(target=os.path.join('$RAD_BUILDBIN', 'mkillum'),
42 +                source=Split('mkillum.c mkillum2.c mkillum3.c'),
43 +                CPPPATH=env.get('CPPPATH', []) + ['#src/rt'],
44 +                LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtproc',
45 +                'rtpath','rtmath','rtargs','rtio','rtcont','rtmem','rterror']
46 +                + mlib)
47 + prog = env.Program(target=os.path.join('$RAD_BUILDBIN', 'mksource'),
48 +                source=['mksource.c'],
49 +                CPPPATH=env.get('CPPPATH', []) + ['#src/rt'],
50 +                LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtproc',
51 +                'rtmath','rtcont','rtmem','rtargs','rtio','rtpath','rterror'] + mlib)
52 + progs.append(prog)
53 +
54   if os.name == 'posix':
55          Default(env.InstallCsh(os.path.join('$RAD_BUILDBIN', 'glaze'), 'glaze.csh'))
56  
# Line 42 | Line 58 | Default('#src/gen')
58   env.Install('$RAD_BINDIR', progs)
59  
60   #surf.cal clockface.hex
61 < LIBFILES = Split('illum.cal rev.cal skybright.cal surf.cal glaze1.cal glaze2.cal clockface.hex')
61 > LIBFILES = Split('illum.cal rev.cal skybright.cal glaze1.cal glaze2.cal')
62   env.Append(RAD_RLIBINSTALL=env.Install('$RAD_RLIBDIR', LIBFILES))
63  
64  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines