diff options
| author | Zack Rusin <[email protected]> | 2010-03-30 21:10:33 -0400 |
|---|---|---|
| committer | Zack Rusin <[email protected]> | 2010-03-30 21:10:33 -0400 |
| commit | 880e3fb09b538f6f0b6fad2db7e0e10e9df43555 (patch) | |
| tree | e6cc8c691974e679ead73c3731c49a874019c8ba /src/gallium/targets/SConscript | |
| parent | 93e342574f5fc95789028dbe7cf637257562e9bb (diff) | |
| parent | 4afed821baa6993d85a07c67d42ea40d4e9a600a (diff) | |
Merge remote branch 'origin/master' into gallium_draw_llvm
Diffstat (limited to 'src/gallium/targets/SConscript')
| -rw-r--r-- | src/gallium/targets/SConscript | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/src/gallium/targets/SConscript b/src/gallium/targets/SConscript index df62fc65fb7..1292d4f6193 100644 --- a/src/gallium/targets/SConscript +++ b/src/gallium/targets/SConscript @@ -1,9 +1,4 @@ Import('*') - -#if env['dri']: -# SConscript([ -# 'drm/SConscript', -# ]) if 'xlib' in env['winsys']: SConscript([ @@ -14,3 +9,19 @@ if 'gdi' in env['winsys']: SConscript([ 'libgl-gdi/SConscript', ]) + +if 'graw-xlib' in env['winsys']: + SConscript([ + 'graw-xlib/SConscript', + ]) + +if env['dri']: + SConscript([ + 'SConscript.dri' + ]) + +if 'xorg' in env['statetrackers']: + if 'vmware' in env['winsys']: + SConscript([ + 'xorg-vmwgfx/SConscript', + ]) |