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.11 by schorsch, Wed Oct 7 22:05:42 2009 UTC

# Line 24 | Line 24 | PROGS = (
24   ('genbranch',   ['genbranch.c',], []),
25   ('replmarks',   ['replmarks.c',],
26          ['rtproc','rtpath','rtmath','rtio','rterror']),
27 < ('mkillum',     Split('mkillum.c mkillum2.c mkillum3.c'),
28 <    ['rtproc','rtscene','rtpath','rtmath','rtio','rtcont','rterror']),
27 > #('mkillum',     Split('mkillum.c mkillum2.c mkillum3.c'),
28 > #    ['rtproc','rtscene','rtpath','rtmath','rtio','rtcont','rterror']),
29 > #('mksource',    ['mksource.c'],
30 > #       ['rtio','rtmath','rterror']),
31   ('xform',       ['xform.c',],
32      ['rtproc','rtscene','rtmath','rtargs','rtio','rtcont','rtpath','rterror']),
33   )
34   progs = []
35   for p in PROGS:
36 <    prog = env.Program(target=os.path.join(env['RAD_BUILDBIN'], p[0]),
36 >    prog = env.Program(target=os.path.join('$RAD_BUILDBIN', p[0]),
37              source=p[1], LIBS=p[2] + mlib)
38      progs.append(prog)
39 +
40 + prog = env.Program(target=os.path.join('$RAD_BUILDBIN', 'mkillum'),
41 +                source=Split('mkillum.c mkillum2.c mkillum3.c'),
42 +                CPPPATH=env.get('CPPPATH', []) + ['#src/rt'],
43 +                LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtproc',
44 +                'rtpath','rtmath','rtargs','rtio','rtcont','rtmem','rterror']
45 +                + mlib)
46 + prog = env.Program(target=os.path.join('$RAD_BUILDBIN', 'mksource'),
47 +                source=['mksource.c'],
48 +                CPPPATH=env.get('CPPPATH', []) + ['#src/rt'],
49 +                LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtproc',
50 +                'rtmath','rtcont','rtmem','rtargs','rtio','rtpath','rterror'] + mlib)
51 + progs.append(prog)
52  
53   if os.name == 'posix':
54          Default(env.InstallCsh(os.path.join('$RAD_BUILDBIN', 'glaze'), 'glaze.csh'))

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines