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

Comparing ray/src/px/SConscript (file contents):
Revision 1.5 by schorsch, Sun Jul 4 12:08:48 2004 UTC vs.
Revision 1.6 by schorsch, Tue Jul 6 11:49:09 2004 UTC

# Line 125 | Line 125 | if env.has_key('PIXAR_LIB'):
125  
126   # X11 targets
127   if env.has_key('X11LIB'):
128 <    xcppp = env.get('CPPPATH',[]) + [env['X11INCLUDE']]
128 >    xincl = 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 ../
131 >    x11findwind = env.Object(source='../common/x11findwind.c', # XXX ../not/nice
132 >                CPPPATH=xincl)
133  
134      ximage = env.Program(target=radbin('ximage'),
135          source=Split('x11image.c x11raster.c')+[clrtab],
136 <        CPPPATH=xcppp, LIBPATH=xlibp, LIBS=xlibs + mlib)
136 >        CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
137      Default(ximage)
138      env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], ximage)])
139  
140      xshowtrace = env.Program(target=radbin('xshowtrace'),
141          source=Split('xshowtrace.c') + [x11findwind],
142 <        CPPPATH=xcppp, LIBPATH=xlibp, LIBS=xlibs + mlib)
142 >        CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
143      Default(xshowtrace)
144      env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], xshowtrace)])
145  

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)