diff options
author | Dave Airlie <airlied@redhat.com> | 2009-02-13 01:11:25 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-02-13 01:11:25 +1000 |
commit | 53116910b10e3b8a05f42970eff311c21808699f (patch) | |
tree | 6831e50a56a02fed324f8cb119e05d837e00d7cf /configs/linux-dri-x86 | |
parent | 7e104f9cde94279a902b408e8d1cf21779b393a8 (diff) | |
parent | 0ccbc3c905f0594a35d72887a1f115e148aaa596 (diff) |
Merge remote branch 'origin/master' into radeon-rewrite
Conflicts:
configure.ac
src/mesa/drivers/dri/r200/r200_context.c
src/mesa/drivers/dri/r300/r300_render.c
Diffstat (limited to 'configs/linux-dri-x86')
-rw-r--r-- | configs/linux-dri-x86 | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/configs/linux-dri-x86 b/configs/linux-dri-x86 index f9b164d27a..4e7d45d35a 100644 --- a/configs/linux-dri-x86 +++ b/configs/linux-dri-x86 @@ -5,10 +5,9 @@ include $(TOP)/configs/linux-dri CONFIG_NAME = linux-dri-x86 -# Add -m32 to CFLAGS: -ARCH_FLAGS = -m32 +ARCH_FLAGS = -m32 -mmmx -msse -msse2 ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -ASM_SOURCES = $(X86_SOURCES) -ASM_API = $(X86_API) +MESA_ASM_SOURCES = $(X86_SOURCES) +GLAPI_ASM_SOURCES = $(X86_API) |