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

Comparing ray/src/px/SConscript (file contents):
Revision 1.4 by schorsch, Fri Mar 26 21:32:01 2004 UTC vs.
Revision 1.5 by schorsch, Sun Jul 4 12:08:48 2004 UTC

# Line 118 | Line 118 | if os.name == 'posix':
118   # pixar format requires extra lib
119   if env.has_key('PIXAR_LIB'):
120      ra_pixar = env.Program(radbin('ra_pixar'), source=['ra_pixar.c'],
121 <                LIBS=['rtpic', env['PIXAR_LIB']])
121 >        LIBS=['rtpic', env['PIXAR_LIB']])
122      Default(ra_pixar)
123      env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], ra_pixar)])
124  
# Line 128 | Line 128 | if env.has_key('X11LIB'):
128      xcppp = env.get('CPPPATH',[]) + [env['X11INCLUDE']]
129      xlibp = env.get('LIBPATH',[]) + [env['X11LIB']]
130      xlibs = ['X11','rtpic','rtio','rtmath','rtargs','rtmem']
131 +    x11findwind = env.Object(source='../common/x11findwind.c') # XXX ../
132  
133      ximage = env.Program(target=radbin('ximage'),
134          source=Split('x11image.c x11raster.c')+[clrtab],
# Line 136 | Line 137 | if env.has_key('X11LIB'):
137      env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], ximage)])
138  
139      xshowtrace = env.Program(target=radbin('xshowtrace'),
140 <        source=Split('xshowtrace.c x11findwind.c'),
140 >        source=Split('xshowtrace.c') + [x11findwind],
141          CPPPATH=xcppp, LIBPATH=xlibp, LIBS=xlibs + mlib)
142      Default(xshowtrace)
143      env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], xshowtrace)])

Diff Legend

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