Mesa (gallium-llvmpipe): softpipe: Update sconscript.

[Jose Fonseca]

Module: Mesa
Branch: gallium-llvmpipe
Commit: 3839e1dd5e7967f0f34ad1a0ae8de3a0b86d04f5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3839e1dd5e7967f0f34ad1a0ae8de3a0b86d04f5

Author: José Fonseca <jfonseca at vmware.com>
Date:   Mon Jul 27 22:22:05 2009 +0100

softpipe: Update sconscript.

---

 src/gallium/drivers/softpipe/SConscript |    7 +------
 src/gallium/winsys/xlib/Makefile        |    1 +
 src/gallium/winsys/xlib/SConscript      |    7 +++++++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/softpipe/SConscript b/src/gallium/drivers/softpipe/SConscript
index dcc2573..d4c27f7 100644
--- a/src/gallium/drivers/softpipe/SConscript
+++ b/src/gallium/drivers/softpipe/SConscript
@@ -15,15 +15,10 @@ softpipe = env.ConvenienceLibrary(
 		'sp_prim_setup.c',
 		'sp_prim_vbuf.c',
 		'sp_setup.c',
-		'sp_quad_alpha_test.c',
 		'sp_quad_blend.c',
 		'sp_quad_pipe.c',
-		'sp_quad_coverage.c',
 		'sp_quad_depth_test.c',
-		'sp_quad_earlyz.c',
 		'sp_quad_fs.c',
-		'sp_quad_occlusion.c',
-		'sp_quad_stencil.c',
 		'sp_quad_stipple.c',
 		'sp_query.c',
 		'sp_screen.c',
@@ -41,4 +36,4 @@ softpipe = env.ConvenienceLibrary(
 		'sp_tile_cache.c',
 	])
 
-Export('softpipe')
\ No newline at end of file
+Export('softpipe')
diff --git a/src/gallium/winsys/xlib/Makefile b/src/gallium/winsys/xlib/Makefile
index 522f6dc..73062a4 100644
--- a/src/gallium/winsys/xlib/Makefile
+++ b/src/gallium/winsys/xlib/Makefile
@@ -35,6 +35,7 @@ XLIB_WINSYS_SOURCES = \
 	xlib_brw_context.c \
 	xlib_brw_screen.c \
 	xlib_softpipe.c \
+	xlib_llvmpipe.c \
 	xlib_trace.c 
 
 
diff --git a/src/gallium/winsys/xlib/SConscript b/src/gallium/winsys/xlib/SConscript
index 0fb4b50..fe65f1b 100644
--- a/src/gallium/winsys/xlib/SConscript
+++ b/src/gallium/winsys/xlib/SConscript
@@ -29,6 +29,13 @@ if env['platform'] == 'linux' \
         sources += ['xlib_softpipe.c']
         drivers += [softpipe]
 
+    if 'llvmpipe' in env['drivers']:
+        env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
+        env.ParseConfig('llvm-config --libs jit interpreter nativecodegen')
+        env['LINK'] = env['CXX']
+        sources += ['xlib_llvmpipe.c']
+        drivers += [llvmpipe]
+
     if 'i965simple' in env['drivers']:
         env.Append(CPPDEFINES = 'GALLIUM_I965SIMPLE')
         sources += [