From e4fb332af1e62db930bc9a435cab3c0aa32cdea8 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Mon, 21 May 2012 22:16:15 -0700 Subject: [PATCH] scons: Do not build glx and egl on Cygwin. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Vinson Lee Reviewed-by: José Fonseca --- src/SConscript | 2 +- src/gallium/SConscript | 4 ++-- 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' ]) -- 2.30.2