summaryrefslogtreecommitdiff
path: root/src/gallium/targets
diff options
context:
space:
mode:
authorJakob Bornecrantz <wallbraker@gmail.com>2010-05-13 20:29:18 +0100
committerJerome Glisse <jglisse@redhat.com>2010-05-27 23:24:12 +0200
commitaeee52691ccb3afd24591ab3df30d7f243bc3eeb (patch)
treef4785fea68b2541f9e5eedb2147ebe7096e5b549 /src/gallium/targets
parent9abfc5ef60ba26505a333bdd0f17a83c90ce316a (diff)
r600g: Integrate into build
Signed-off-by: Jakob Bornecrantz <wallbraker@gmail.com>
Diffstat (limited to 'src/gallium/targets')
-rw-r--r--src/gallium/targets/SConscript.dri5
-rw-r--r--src/gallium/targets/dri-r600/SConscript2
2 files changed, 6 insertions, 1 deletions
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,