From db0e24e34a4680c70038715f23847b9b2f7f75d3 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Sat, 14 Aug 2010 12:18:51 -0700
Subject: [PATCH] scons: Fix r600g build.

---
 src/gallium/targets/dri-r600/SConscript |  2 +-
 src/gallium/winsys/r600/drm/SConscript  | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 src/gallium/winsys/r600/drm/SConscript

diff --git a/src/gallium/targets/dri-r600/SConscript b/src/gallium/targets/dri-r600/SConscript
index 97c5df0..64d6d2a 100644
--- a/src/gallium/targets/dri-r600/SConscript
+++ b/src/gallium/targets/dri-r600/SConscript
@@ -12,7 +12,7 @@ env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE'])
 
 env.Prepend(LIBS = [
     st_dri,
-    r600drm,
+    r600winsys,
     r600,
     trace,
     rbug,
diff --git a/src/gallium/winsys/r600/drm/SConscript b/src/gallium/winsys/r600/drm/SConscript
new file mode 100644
index 0000000..2f20d9f
--- /dev/null
+++ b/src/gallium/winsys/r600/drm/SConscript
@@ -0,0 +1,25 @@
+Import('*')
+
+env = env.Clone()
+
+r600_sources = [
+    'bof.c',
+    'r600_state.c',
+    'radeon_ctx.c',
+    'radeon_draw.c',
+    'radeon_state.c',
+    'radeon_bo.c',
+    'radeon_pciid.c',
+    'radeon.c',
+    'r600_drm.c'
+]
+
+env.ParseConfig('pkg-config --cflags libdrm_radeon')
+env.Append(CPPPATH = '#/src/gallium/drivers/r600')
+
+r600winsys = env.ConvenienceLibrary(
+    target ='r600winsys',
+    source = r600_sources,
+)
+
+Export('r600winsys')
-- 
2.7.4