Mesa (master): svga: Add Galahad and Softpipe to scons build

[Jakob Bornecrantz]

Module: Mesa
Branch: master
Commit: f75549a9d8860c3711615483fa64c7cc0f2e87b3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f75549a9d8860c3711615483fa64c7cc0f2e87b3

Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Wed Dec 15 12:13:54 2010 +0100

svga: Add Galahad and Softpipe to scons build

---

 src/gallium/targets/dri-vmwgfx/SConscript |    6 +++---
 src/gallium/targets/dri-vmwgfx/target.c   |    3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/gallium/targets/dri-vmwgfx/SConscript b/src/gallium/targets/dri-vmwgfx/SConscript
index 7888e4f..e05ced9 100644
--- a/src/gallium/targets/dri-vmwgfx/SConscript
+++ b/src/gallium/targets/dri-vmwgfx/SConscript
@@ -2,14 +2,14 @@ Import('*')
 
 env = drienv.Clone()
 
-env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE'])
+if True:
+    env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_GALAHAD', 'GALLIUM_SOFTPIPE'])
+    env.Prepend(LIBS = [trace, rbug, galahad, softpipe, ws_wrapper])
 
 env.Prepend(LIBS = [
     st_dri,
     svgadrm,
     svga,
-    trace,
-    rbug,
     mesa,
     glsl,
     gallium,
diff --git a/src/gallium/targets/dri-vmwgfx/target.c b/src/gallium/targets/dri-vmwgfx/target.c
index 15089d6..1362851 100644
--- a/src/gallium/targets/dri-vmwgfx/target.c
+++ b/src/gallium/targets/dri-vmwgfx/target.c
@@ -1,4 +1,5 @@
 
+#include "target-helpers/inline_wrapper_sw_helper.h"
 #include "target-helpers/inline_debug_helper.h"
 #include "state_tracker/drm_driver.h"
 #include "svga/drm/svga_drm_public.h"
@@ -18,6 +19,8 @@ create_screen(int fd)
    if (!screen)
       return NULL;
 
+   screen = sw_screen_wrap(screen);
+
    screen = debug_screen_wrap(screen);
 
    return screen;