summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinson Lee <vlee@freedesktop.org>2012-05-21 22:16:15 -0700
committerVinson Lee <vlee@freedesktop.org>2012-05-22 10:15:14 -0700
commite4fb332af1e62db930bc9a435cab3c0aa32cdea8 (patch)
treeba5841ddfb70eb8defbd403700d995b817bfd9db
parent89155ba71d9d3bb8f8b6ea095f75eaf38122e09c (diff)
scons: Do not build glx and egl on Cygwin.
Signed-off-by: Vinson Lee <vlee@freedesktop.org> Reviewed-by: José Fonseca <jfonseca@vmware.com>
-rw-r--r--src/SConscript2
-rw-r--r--src/gallium/SConscript4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/SConscript b/src/SConscript
index 777ad23f2c9..e4cda2fd03e 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -22,7 +22,7 @@ SConscript('mesa/SConscript')
SConscript('mapi/vgapi/SConscript')
if not env['embedded']:
- if env['platform'] not in ['windows', 'darwin', 'haiku']:
+ if env['platform'] not in ('cygwin', 'darwin', 'haiku', 'windows'):
SConscript('glx/SConscript')
if env['platform'] not in ['darwin', 'haiku', 'sunos']:
SConscript('egl/main/SConscript')
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index b61eba0390e..e212ed184cf 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -58,7 +58,7 @@ SConscript('winsys/sw/null/SConscript')
if not env['embedded']:
SConscript('state_trackers/vega/SConscript')
- if env['platform'] not in ['darwin', 'haiku', 'sunos']:
+ if env['platform'] not in ('cygwin', 'darwin', 'haiku', 'sunos'):
SConscript('state_trackers/egl/SConscript')
if env['x11']:
@@ -124,7 +124,7 @@ SConscript([
])
if not env['embedded']:
- if env['platform'] not in ['darwin', 'haiku', 'sunos']:
+ if env['platform'] not in ('cygwin', 'darwin', 'haiku', 'sunos'):
SConscript([
'targets/egl-static/SConscript'
])