aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/SConscript
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-02-27 07:40:19 +0100
committermarha <marha@users.sourceforge.net>2012-02-27 07:40:19 +0100
commitb3e4046e8fdcd369e61c237f8690772bf1d8c64f (patch)
tree5ff8cf47771eede4f2ea6e7c5980fd584f2b4992 /mesalib/src/mesa/SConscript
parentb436c1b7e3adefe7068fb030b83ac12a826251d3 (diff)
parentc4f44c07c6662d1ce08603945ccc4fa5afaa742a (diff)
downloadvcxsrv-b3e4046e8fdcd369e61c237f8690772bf1d8c64f.tar.gz
vcxsrv-b3e4046e8fdcd369e61c237f8690772bf1d8c64f.tar.bz2
vcxsrv-b3e4046e8fdcd369e61c237f8690772bf1d8c64f.zip
Merge remote-tracking branch 'origin/released'
Conflicts: pixman/pixman/pixman-mmx.c
Diffstat (limited to 'mesalib/src/mesa/SConscript')
-rw-r--r--mesalib/src/mesa/SConscript2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/SConscript b/mesalib/src/mesa/SConscript
index e9b1f6aaf..10a04689d 100644
--- a/mesalib/src/mesa/SConscript
+++ b/mesalib/src/mesa/SConscript
@@ -384,7 +384,7 @@ if env['gles']:
#
# Assembly sources
#
-if env['gcc'] and env['platform'] != 'windows':
+if env['gcc'] and env['platform'] not in ('darwin', 'windows'):
if env['machine'] == 'x86':
env.Append(CPPDEFINES = [
'USE_X86_ASM',