From aeee52691ccb3afd24591ab3df30d7f243bc3eeb Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Thu, 13 May 2010 20:29:18 +0100 Subject: r600g: Integrate into build Signed-off-by: Jakob Bornecrantz --- src/gallium/drivers/r600/SConscript | 3 +++ src/gallium/targets/SConscript.dri | 5 +++++ src/gallium/targets/dri-r600/SConscript | 2 +- src/gallium/winsys/SConscript | 5 +++++ 4 files changed, 14 insertions(+), 1 deletion(-) (limited to 'src/gallium') diff --git a/src/gallium/drivers/r600/SConscript b/src/gallium/drivers/r600/SConscript index 26d95bb766d..8c9edd897b2 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 4bbb16c2272..74b53e5023f 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 24eb5f0758c..417c289ea0f 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 330b1ab834c..907ac90bf04 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