aboutsummaryrefslogtreecommitdiff
path: root/mesalib
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-01-08 09:23:42 +0100
committermarha <marha@users.sourceforge.net>2013-01-08 09:23:42 +0100
commit8a26872f0c9102cb357345eca24a4bf7401bbe70 (patch)
treeb12a3cd7065de4d4a717ddde3d56345d012a55b7 /mesalib
parent034d6305a11c9d5dff9318aa897073402d08d705 (diff)
downloadvcxsrv-8a26872f0c9102cb357345eca24a4bf7401bbe70.tar.gz
vcxsrv-8a26872f0c9102cb357345eca24a4bf7401bbe70.tar.bz2
vcxsrv-8a26872f0c9102cb357345eca24a4bf7401bbe70.zip
fontconfig mesa git update 8 jan 2013
fontconfig: 4e6c7d0827c5b3b20205521bf9bd2e94e704b36d mesa: a60c567fcf29f5d2a41222a8826fee2cb0eb4458
Diffstat (limited to 'mesalib')
-rw-r--r--mesalib/scons/gallium.py3
-rw-r--r--mesalib/src/mesa/SConscript2
2 files changed, 2 insertions, 3 deletions
diff --git a/mesalib/scons/gallium.py b/mesalib/scons/gallium.py
index 98671f75d..7207c6bb2 100644
--- a/mesalib/scons/gallium.py
+++ b/mesalib/scons/gallium.py
@@ -361,8 +361,7 @@ def generate(env):
ccflags += [
'-mstackrealign', # ensure stack is aligned
'-march=i586', # Haiku target is Pentium
- '-mtune=i686', # use i686 where we can
- '-mmmx' # use mmx math where we can
+ '-mtune=i686' # use i686 where we can
]
if env['machine'] == 'x86_64':
ccflags += ['-m64']
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',