--- ray/src/px/SConscript 2004/03/26 21:32:01 1.4 +++ ray/src/px/SConscript 2004/07/04 12:08:48 1.5 @@ -118,7 +118,7 @@ if os.name == 'posix': # pixar format requires extra lib if env.has_key('PIXAR_LIB'): ra_pixar = env.Program(radbin('ra_pixar'), source=['ra_pixar.c'], - LIBS=['rtpic', env['PIXAR_LIB']]) + LIBS=['rtpic', env['PIXAR_LIB']]) Default(ra_pixar) env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], ra_pixar)]) @@ -128,6 +128,7 @@ if env.has_key('X11LIB'): xcppp = env.get('CPPPATH',[]) + [env['X11INCLUDE']] xlibp = env.get('LIBPATH',[]) + [env['X11LIB']] xlibs = ['X11','rtpic','rtio','rtmath','rtargs','rtmem'] + x11findwind = env.Object(source='../common/x11findwind.c') # XXX ../ ximage = env.Program(target=radbin('ximage'), source=Split('x11image.c x11raster.c')+[clrtab], @@ -136,7 +137,7 @@ if env.has_key('X11LIB'): env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], ximage)]) xshowtrace = env.Program(target=radbin('xshowtrace'), - source=Split('xshowtrace.c x11findwind.c'), + source=Split('xshowtrace.c') + [x11findwind], CPPPATH=xcppp, LIBPATH=xlibp, LIBS=xlibs + mlib) Default(xshowtrace) env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], xshowtrace)])