summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jrfonseca@tungstengraphics.com>2008-06-27 13:01:37 +0900
committerJosé Fonseca <jrfonseca@tungstengraphics.com>2008-06-27 13:01:37 +0900
commit6106db4c5da6fc5ae9ef157c939ce0834cdc5b92 (patch)
treeec9e868bebcb54036858c815aa8acc779882b849
parentfb4361a93d2bfdd69995d3421bfeb5a339dad5bf (diff)
scons: Fix i965/xlib build.
-rw-r--r--src/gallium/drivers/i965simple/SConscript1
-rw-r--r--src/gallium/winsys/xlib/SConscript7
2 files changed, 7 insertions, 1 deletions
diff --git a/src/gallium/drivers/i965simple/SConscript b/src/gallium/drivers/i965simple/SConscript
index c0825c4de3..43fc2a4005 100644
--- a/src/gallium/drivers/i965simple/SConscript
+++ b/src/gallium/drivers/i965simple/SConscript
@@ -26,6 +26,7 @@ i965simple = env.ConvenienceLibrary(
'brw_gs_emit.c',
'brw_gs_state.c',
'brw_misc_state.c',
+ 'brw_screen.c',
'brw_sf.c',
'brw_sf_emit.c',
'brw_sf_state.c',
diff --git a/src/gallium/winsys/xlib/SConscript b/src/gallium/winsys/xlib/SConscript
index 5e98a36abc..14a85ae0f2 100644
--- a/src/gallium/winsys/xlib/SConscript
+++ b/src/gallium/winsys/xlib/SConscript
@@ -3,7 +3,11 @@
Import('*')
-if env['platform'] == 'linux' and 'mesa' in env['statetrackers'] and not env['dri']:
+if env['platform'] == 'linux' \
+ and 'mesa' in env['statetrackers'] \
+ and 'softpipe' in env['drivers'] \
+ and 'i965simple' in env['drivers'] \
+ and not env['dri']:
env = env.Clone()
@@ -24,6 +28,7 @@ if env['platform'] == 'linux' and 'mesa' in env['statetrackers'] and not env['dr
drivers = [
softpipe,
+ i965simple
]
# TODO: write a wrapper function http://www.scons.org/wiki/WrapperFunctions