From aeee52691ccb3afd24591ab3df30d7f243bc3eeb Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <wallbraker@gmail.com>
Date: Thu, 13 May 2010 20:29:18 +0100
Subject: r600g: Integrate into build

Signed-off-by: Jakob Bornecrantz <wallbraker@gmail.com>
---
 SConstruct                              |  4 ++--
 configure.ac                            | 13 +++++++++++++
 src/gallium/drivers/r600/SConscript     |  3 +++
 src/gallium/targets/SConscript.dri      |  5 +++++
 src/gallium/targets/dri-r600/SConscript |  2 +-
 src/gallium/winsys/SConscript           |  5 +++++
 6 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/SConstruct b/SConstruct
index 5c72323d83..1d41fc57dd 100644
--- a/SConstruct
+++ b/SConstruct
@@ -51,9 +51,9 @@ common.AddOptions(opts)
 opts.Add(ListVariable('statetrackers', 'state trackers to build', default_statetrackers,
                      ['mesa', 'python', 'xorg']))
 opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers,
-                     ['softpipe', 'failover', 'svga', 'i915', 'i965', 'trace', 'r300', 'identity', 'llvmpipe', 'nouveau', 'nv50', 'nvfx']))
+                     ['softpipe', 'failover', 'svga', 'i915', 'i965', 'trace', 'r300', 'r600', 'identity', 'llvmpipe', 'nouveau', 'nv50', 'nvfx']))
 opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys,
-                     ['xlib', 'vmware', 'i915', 'i965', 'gdi', 'radeon', 'graw-xlib']))
+                     ['xlib', 'vmware', 'i915', 'i965', 'gdi', 'radeon', 'r600', 'graw-xlib']))
 
 opts.Add(ListVariable('targets', 'driver targets to build', default_targets,
 		      ['dri-i915',
diff --git a/configure.ac b/configure.ac
index 3d8da6c979..db4f6d740e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1509,6 +1509,19 @@ elif test "x$enable_gallium_radeon" = xauto; then
     GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
 fi
 
+dnl
+dnl Gallium Radeon r600g configuration
+dnl
+AC_ARG_ENABLE([gallium-r600],
+    [AS_HELP_STRING([--enable-gallium-r600],
+        [build gallium radeon @<:@default=disabled@:>@])],
+    [enable_gallium_r600="$enableval"],
+    [enable_gallium_r600=auto])
+if test "x$enable_gallium_r600" = xyes; then
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r600"
+    gallium_check_st "r600/drm" "dri-r600"
+fi
+
 dnl
 dnl Gallium Nouveau configuration
 dnl
diff --git a/src/gallium/drivers/r600/SConscript b/src/gallium/drivers/r600/SConscript
index 26d95bb766..8c9edd897b 100644
--- a/src/gallium/drivers/r600/SConscript
+++ b/src/gallium/drivers/r600/SConscript
@@ -1,6 +1,9 @@
 Import('*')
 
 env = env.Clone()
+
+env.ParseConfig('pkg-config --cflags libdrm_radeon')
+
 env.Append(CPPPATH = [
     '#/include', 
     '#/src/mesa',
diff --git a/src/gallium/targets/SConscript.dri b/src/gallium/targets/SConscript.dri
index 4bbb16c227..74b53e5023 100644
--- a/src/gallium/targets/SConscript.dri
+++ b/src/gallium/targets/SConscript.dri
@@ -99,3 +99,8 @@ if 'radeon' in env['winsys']:
 	SConscript([
 		'dri-radeong/SConscript',
 	])
+
+if 'r600' in env['winsys']:
+	SConscript([
+		'dri-r600/SConscript',
+	])
diff --git a/src/gallium/targets/dri-r600/SConscript b/src/gallium/targets/dri-r600/SConscript
index 24eb5f0758..417c289ea0 100644
--- a/src/gallium/targets/dri-r600/SConscript
+++ b/src/gallium/targets/dri-r600/SConscript
@@ -10,7 +10,7 @@ env.ParseConfig('pkg-config --cflags --libs libdrm_radeon')
 
 env.Prepend(LIBS = [
     st_dri,
-    r600winsys,
+    r600drm,
     r600,
     trace,
     mesa,
diff --git a/src/gallium/winsys/SConscript b/src/gallium/winsys/SConscript
index 330b1ab834..907ac90bf0 100644
--- a/src/gallium/winsys/SConscript
+++ b/src/gallium/winsys/SConscript
@@ -40,3 +40,8 @@ if env['dri']:
 		SConscript([
 			'radeon/drm/SConscript',
 		])
+
+	if 'r600' in env['winsys']:
+		SConscript([
+			'r600/drm/SConscript',
+		])
-- 
cgit v1.2.3