aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-01-08 12:40:16 +0100
committermarha <marha@users.sourceforge.net>2013-01-08 12:40:16 +0100
commitc2ada0e240f7c721ed09c9570b5375833c47370c (patch)
treeedf46fc67b3b6af1a10b2e5e223712fdc6dc77ea /mesalib/src/mesa
parent066de3c6d46ca099caba474b8e7d132ec772bc65 (diff)
parent8a26872f0c9102cb357345eca24a4bf7401bbe70 (diff)
downloadvcxsrv-c2ada0e240f7c721ed09c9570b5375833c47370c.tar.gz
vcxsrv-c2ada0e240f7c721ed09c9570b5375833c47370c.tar.bz2
vcxsrv-c2ada0e240f7c721ed09c9570b5375833c47370c.zip
Merge remote-tracking branch 'origin/released'
* origin/released: fontconfig mesa git update 8 jan 2013 Conflicts: fontconfig/src/fccache.c
Diffstat (limited to 'mesalib/src/mesa')
-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 a2492f771..a28db23e4 100644
--- a/mesalib/src/mesa/SConscript
+++ b/mesalib/src/mesa/SConscript
@@ -370,7 +370,7 @@ env.Depends(glget_sources, get_hash_header)
#
# Assembly sources
#
-if env['gcc'] and env['platform'] not in ('cygwin', 'darwin', 'windows'):
+if env['gcc'] and env['platform'] not in ('cygwin', 'darwin', 'windows', 'haiku'):
if env['machine'] == 'x86':
env.Append(CPPDEFINES = [
'USE_X86_ASM',