summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVinson Lee <vlee@vmware.com>2010-08-14 12:18:51 -0700
committerVinson Lee <vlee@vmware.com>2010-08-14 12:18:51 -0700
commitdb0e24e34a4680c70038715f23847b9b2f7f75d3 (patch)
tree00935094f800b5bdbfeb68c46413a370a6d3dfec /src
parent77458b565a531721904b7f3e31b71505e763b97a (diff)
scons: Fix r600g build.
Diffstat (limited to 'src')
-rw-r--r--src/gallium/targets/dri-r600/SConscript2
-rw-r--r--src/gallium/winsys/r600/drm/SConscript25
2 files changed, 26 insertions, 1 deletions
diff --git a/src/gallium/targets/dri-r600/SConscript b/src/gallium/targets/dri-r600/SConscript
index 97c5df01fe2..64d6d2a7f6f 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 00000000000..2f20d9f8957
--- /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')