From 3dcc3153b087a2ec42e6177d965dd8b2c95779c2 Mon Sep 17 00:00:00 2001 From: José Fonseca Date: Thu, 18 Nov 2010 13:02:36 +0000 Subject: scons: Use inline wrap helpers more consistently. --- src/gallium/targets/libgl-xlib/SConscript | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/gallium/targets/libgl-xlib') diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript index 6582a2f27b..d932736be7 100644 --- a/src/gallium/targets/libgl-xlib/SConscript +++ b/src/gallium/targets/libgl-xlib/SConscript @@ -19,9 +19,6 @@ env.Prepend(LIBS = env['X11_LIBS']) env.Prepend(LIBS = [ st_xlib, ws_xlib, - trace, - rbug, - galahad, glapi, mesa, glsl, @@ -34,11 +31,11 @@ sources = [ ] if True: - env.Append(CPPDEFINES = 'GALLIUM_SOFTPIPE') - env.Prepend(LIBS = [softpipe]) + env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_GALAHAD', 'GALLIUM_SOFTPIPE']) + env.Prepend(LIBS = [trace, rbug, galahad, softpipe]) if env['llvm']: - env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE') + env.Append(CPPDEFINES = ['GALLIUM_LLVMPIPE']) env.Prepend(LIBS = [llvmpipe]) if False: -- cgit v1.2.3