From e57405e8d516c09b890c6f1c3bd8fe7780417c95 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <wallbraker@gmail.com>
Date: Fri, 26 Mar 2010 14:47:20 +0100
Subject: swrastg: Use llvmpipe if built but only on scons

---
 src/gallium/targets/dri-swrast/SConscript | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'src/gallium/targets/dri-swrast/SConscript')

diff --git a/src/gallium/targets/dri-swrast/SConscript b/src/gallium/targets/dri-swrast/SConscript
index e9f742c43c..94ff99a0a9 100644
--- a/src/gallium/targets/dri-swrast/SConscript
+++ b/src/gallium/targets/dri-swrast/SConscript
@@ -1,7 +1,7 @@
 Import('*')
 
-if not 'softpipe' in env['drivers']:
-    print 'warning: softpipe driver not built skipping swrastg_dri.so'
+if not set(('softpipe', 'llvmpipe')).intersection(env['drivers']):
+    print 'warning: no supported pipe driver: skipping build of swrastg_dri.so'
     Return()
 
 env = drienv.Clone()
@@ -13,7 +13,6 @@ env.Append(CPPPATH = [
 env.Prepend(LIBS = [
     st_drisw,
     ws_dri,
-    softpipe,
     trace,
     mesa,
     glsl,
@@ -21,6 +20,17 @@ env.Prepend(LIBS = [
     COMMON_DRI_SW_OBJECTS
 ])
 
+if 'softpipe' in env['drivers']:
+    env.Append(CPPDEFINES = 'GALLIUM_SOFTPIPE')
+    env.Prepend(LIBS = [softpipe])
+
+if 'llvmpipe' in env['drivers']:
+    env.Tool('llvm')
+    if 'LLVM_VERSION' in env:
+        env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
+        env.Tool('udis86')
+        env.Prepend(LIBS = [llvmpipe])
+
 swrastg_sources = [
     'swrast_drm_api.c'
 ]
-- 
cgit v1.2.3