diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-08 12:40:16 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-08 12:40:16 +0100 |
| commit | c2ada0e240f7c721ed09c9570b5375833c47370c (patch) | |
| tree | edf46fc67b3b6af1a10b2e5e223712fdc6dc77ea /mesalib | |
| parent | 066de3c6d46ca099caba474b8e7d132ec772bc65 (diff) | |
| parent | 8a26872f0c9102cb357345eca24a4bf7401bbe70 (diff) | |
| download | vcxsrv-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')
| -rw-r--r-- | mesalib/scons/gallium.py | 3 | ||||
| -rw-r--r-- | mesalib/src/mesa/SConscript | 2 |
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', |