summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinson Lee <vlee@freedesktop.org>2012-09-27 23:21:09 -0700
committerVinson Lee <vlee@freedesktop.org>2012-09-28 23:29:10 -0700
commit9549e55f1108540b513dfdb8277655a9f367c5f8 (patch)
treead50eed786cdb75f7868e022bd0174c2f06c35b1
parent00905dbf19712c532bcdb2a2f7bf5d327d4df97b (diff)
downloadexternal_mesa3d-9549e55f1108540b513dfdb8277655a9f367c5f8.zip
external_mesa3d-9549e55f1108540b513dfdb8277655a9f367c5f8.tar.gz
external_mesa3d-9549e55f1108540b513dfdb8277655a9f367c5f8.tar.bz2
scons: Disable build of assembly sources on Cygwin.
The assembly sources currently do not build on Cygwin. Signed-off-by: Vinson Lee <vlee@freedesktop.org> Reviewed-by: Brian Paul <brianp@vmware.com>
-rw-r--r--src/mapi/glapi/SConscript2
-rw-r--r--src/mesa/SConscript2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mapi/glapi/SConscript b/src/mapi/glapi/SConscript
index ad007a6..c336c25 100644
--- a/src/mapi/glapi/SConscript
+++ b/src/mapi/glapi/SConscript
@@ -48,7 +48,7 @@ for s in mapi_sources:
#
# Assembly sources
#
-if env['gcc'] and env['platform'] not in ('darwin', 'windows'):
+if env['gcc'] and env['platform'] not in ('cygwin', 'darwin', 'windows'):
GLAPI = '#src/mapi/glapi/'
if env['machine'] == 'x86':
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index dba75a2..9819082 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -371,7 +371,7 @@ if env['gles']:
#
# Assembly sources
#
-if env['gcc'] and env['platform'] not in ('darwin', 'windows'):
+if env['gcc'] and env['platform'] not in ('cygwin', 'darwin', 'windows'):
if env['machine'] == 'x86':
env.Append(CPPDEFINES = [
'USE_X86_ASM',