Mesa (master): scons: Do not build glx and egl on Cygwin.
Vinson Lee
vlee at kemper.freedesktop.org
Tue May 22 17:15:33 UTC 2012
Module: Mesa
Branch: master
Commit: e4fb332af1e62db930bc9a435cab3c0aa32cdea8
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e4fb332af1e62db930bc9a435cab3c0aa32cdea8
Author: Vinson Lee <vlee at freedesktop.org>
Date: Mon May 21 22:16:15 2012 -0700
scons: Do not build glx and egl on Cygwin.
Signed-off-by: Vinson Lee <vlee at freedesktop.org>
Reviewed-by: José Fonseca <jfonseca at vmware.com>
---
src/SConscript | 2 +-
src/gallium/SConscript | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/SConscript b/src/SConscript
index 777ad23..e4cda2f 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 b61eba0..e212ed1 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'
])
More information about the mesa-commit
mailing list