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.9 by schorsch, Thu Apr 24 10:28:25 2008 UTC vs.
Revision 1.11 by schorsch, Wed Oct 7 22:05:42 2009 UTC

# Line 37 | Line 37 | for p in PROGS:
37              source=p[1], LIBS=p[2] + mlib)
38      progs.append(prog)
39  
40 – ezxml = env.Object('ezxml.c',
41 –                CPPDEFINES=env.get('CPPDEFINES',[]) + env.get('EZXML_CPPDEFINES',[]))
42 –
40   prog = env.Program(target=os.path.join('$RAD_BUILDBIN', 'mkillum'),
41 <                source=Split('mkillum.c mkillum2.c mkillum3.c mkillum4.c') + ezxml,
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']
# Line 49 | Line 46 | prog = env.Program(target=os.path.join('$RAD_BUILDBIN'
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',
49 >                LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtproc',
50                  'rtmath','rtcont','rtmem','rtargs','rtio','rtpath','rterror'] + mlib)
51   progs.append(prog)
52  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines