scons: Fix i965/xlib build.

diff --git a/src/gallium/drivers/i965simple/SConscript b/src/gallium/drivers/i965simple/SConscript
index c0825c4..43fc2a4 100644 (file)
--- 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 5e98a36..14a85ae 100644 (file)
--- 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