diff options
author | Ben Skeggs <[email protected]> | 2008-06-29 12:16:13 +1000 |
---|---|---|
committer | Ben Skeggs <[email protected]> | 2008-06-29 12:16:13 +1000 |
commit | 01de2293d5449ab6ca1d99b007c9ea4f0037fef5 (patch) | |
tree | 8560aab576c3d8504f8d7935ab6fcd46ea35182e /src/gallium/winsys/xlib/SConscript | |
parent | b831aa06dc0d099185bcaa180683ad10942feaa0 (diff) | |
parent | 9d94d133b019ef23ee03cc691fcb5602451604ae (diff) |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/winsys/xlib/SConscript')
-rw-r--r-- | src/gallium/winsys/xlib/SConscript | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gallium/winsys/xlib/SConscript b/src/gallium/winsys/xlib/SConscript index 5e98a36abc2..14a85ae0f2b 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 |