summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJosé Fonseca <jrfonseca@tungstengraphics.com>2008-02-23 00:46:40 +0900
committerJosé Fonseca <jrfonseca@tungstengraphics.com>2008-02-23 00:47:28 +0900
commit26c57d163092d8069c69ff47929e73682b819ab2 (patch)
tree50de8e4648611ae0ed31b6f67362529ea33e5cc1 /src
parent16245d9b38c8cfd5c9ad1636bc0cfcce308a740b (diff)
Avoid building problematic module/drivers on windows.
Diffstat (limited to 'src')
-rw-r--r--src/SConscript11
-rw-r--r--src/gallium/SConscript9
-rw-r--r--src/gallium/winsys/SConscript3
3 files changed, 15 insertions, 8 deletions
diff --git a/src/SConscript b/src/SConscript
index 5b09943894..e2ee50dd6e 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -1,7 +1,8 @@
Import('*')
-SConscript([
- 'gallium/SConscript',
- 'mesa/SConscript',
- 'gallium/winsys/SConscript',
-])
+SConscript('gallium/SConscript')
+
+if 'mesa' in env['state_trackers']:
+ SConscript('mesa/SConscript')
+
+SConscript('gallium/winsys/SConscript')
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index a08b4b830e..210fd7d309 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -23,7 +23,12 @@ if llvm:
SConscript([
'drivers/softpipe/SConscript',
'drivers/i915simple/SConscript',
- 'drivers/i965simple/SConscript',
'drivers/failover/SConscript',
- #'drivers/cell/SConscript',
])
+
+if not msvc:
+ SConscript(['drivers/i965simple/SConscript'])
+
+#if cell:
+# SConscript(['drivers/cell/SConscript'])
+ \ No newline at end of file
diff --git a/src/gallium/winsys/SConscript b/src/gallium/winsys/SConscript
index 32215d8d58..3f0596e19c 100644
--- a/src/gallium/winsys/SConscript
+++ b/src/gallium/winsys/SConscript
@@ -4,7 +4,8 @@ if dri:
SConscript([
'dri/SConscript',
])
-else:
+
+if env['x11'] and not dri and platform != 'winddk':
SConscript([
'xlib/SConscript',
])