summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2009-10-05 18:32:36 +0100
committerJosé Fonseca <jfonseca@vmware.com>2009-10-09 11:08:17 +0100
commitb858257ca698e2f7dd3004299ae91d3687ae1f1b (patch)
tree45c18328e50d48546ee8b64c4ca2b557752aa46a
parent44c6c20b69839ea130a255496f5f692186b68793 (diff)
gdi: Fix the build when llvmpipe is requested (the default) but llvm is not present.
-rw-r--r--src/gallium/winsys/gdi/SConscript18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/gallium/winsys/gdi/SConscript b/src/gallium/winsys/gdi/SConscript
index f5e6d36d89..8f556daf04 100644
--- a/src/gallium/winsys/gdi/SConscript
+++ b/src/gallium/winsys/gdi/SConscript
@@ -18,14 +18,20 @@ if env['platform'] == 'windows':
'ws2_32',
])
- if 'llvmpipe' in env['drivers']:
- sources = ['gdi_llvmpipe_winsys.c']
- drivers = [llvmpipe]
- env.Tool('llvm')
- elif 'softpipe' in env['drivers']:
+ sources = []
+ drivers = []
+
+ if 'softpipe' in env['drivers']:
sources = ['gdi_softpipe_winsys.c']
drivers = [softpipe]
- else:
+
+ if 'llvmpipe' in env['drivers']:
+ env.Tool('llvm')
+ if 'LLVM_VERSION' in env:
+ sources = ['gdi_llvmpipe_winsys.c']
+ drivers = [llvmpipe]
+
+ if not sources or not drivers:
print 'warning: softpipe or llvmpipe not selected, gdi winsys disabled'
Return()