Merge commit 'origin/master' into gallium-0.2

[mesa.git] / src / gallium / winsys / SConscript

diff --git a/src/gallium/winsys/SConscript b/src/gallium/winsys/SConscript
index f18d3bd2f8e77b45cc56a49edf200476331a321d..30c3378dfff432dac799422690b4f2f5f98300c3 100644 (file)
--- a/src/gallium/winsys/SConscript
+++ b/src/gallium/winsys/SConscript
@@ -1,11 +1,16 @@
 Import('*')
 
-if dri:
+if env['dri']:
        SConscript([
-               'dri/SConscript',
+               'drm/SConscript',
        ])
        
-if 'xlib' in env['winsys'] and not dri:
+if 'xlib' in env['winsys']:
        SConscript([
                'xlib/SConscript',
        ])
+
+if 'gdi' in env['winsys']:
+       SConscript([
+               'gdi/SConscript',
+       ])