scons: Do not build glx and egl on Cygwin.

Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: José Fonseca <jfonseca@vmware.com>

diff --git a/src/SConscript b/src/SConscript
index 777ad23f2c904104b1d0cc4133914bd55f8708ea..e4cda2fd03e0dd203bcfc1264b343b9da1132db7 100644 (file)
--- a/src/SConscript
+++ b/src/SConscript
@@ -22,7 +22,7 @@ SConscript('mesa/SConscript')
 SConscript('mapi/vgapi/SConscript')
 
 if not env['embedded']:
 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')
         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 b61eba0390e19acfdbbdc7261b939206e483d941..e212ed184cf26e9b4fc70ef407c6a7ad927825a4 100644 (file)
--- 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 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']:
         SConscript('state_trackers/egl/SConscript')
 
     if env['x11']:


@@ -124,7 +124,7 @@ SConscript([
 ])
 
 if not env['embedded']:
 ])
 
 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'
         ])
         SConscript([
             'targets/egl-static/SConscript'
         ])