Merge branch 'glsl2-head' into glsl2

[mesa.git] / src / gallium / targets / libgl-gdi / SConscript

diff --git a/src/gallium/targets/libgl-gdi/SConscript b/src/gallium/targets/libgl-gdi/SConscript
index 21b4eb2abee034d33757a54d05eb22968285fdb8..144084f74f838cbda095da3ccee3243dde9e479e 100644 (file)
--- a/src/gallium/targets/libgl-gdi/SConscript
+++ b/src/gallium/targets/libgl-gdi/SConscript
@@ -22,26 +22,20 @@ if env['platform'] == 'windows':
     sources = []
     drivers = []
 
-    if 'softpipe' in env['drivers']:
+    if True:
         sources = ['gdi_softpipe_winsys.c']
         drivers = [softpipe]
 
-    if 'llvmpipe' in env['drivers']:
-        env.Tool('llvm')
-        if 'LLVM_VERSION' in env:
-            sources = ['gdi_llvmpipe_winsys.c']
-            drivers = [llvmpipe]
+    if env['llvm']:
+        sources = ['gdi_llvmpipe_winsys.c']
+        drivers = [llvmpipe]
 
-    if not sources or not drivers:
-        print 'warning: softpipe or llvmpipe not selected, gdi winsys disabled'
-        Return()
-    
     if env['gcc']:
         sources += ['#src/gallium/state_trackers/wgl/opengl32.mingw.def']
     else:
         sources += ['#src/gallium/state_trackers/wgl/opengl32.def']
         
-    drivers += [trace]
+    drivers += [trace, rbug]
 
     env['no_import_lib'] = 1