diff options
| author | Ben Skeggs <darktama@beleth.(none)> | 2008-02-22 12:25:15 +1100 |
|---|---|---|
| committer | Ben Skeggs <darktama@beleth.(none)> | 2008-02-22 12:25:15 +1100 |
| commit | f7922db610d05efee0ee8c5f0dadb69e3939482e (patch) | |
| tree | accfc0fdd96e1f572213cf69ea365c01bda0ef46 /configs/beos | |
| parent | 759fa5fcc8038af4845a6d9c57b75933ef26559c (diff) | |
| parent | 446bfc32a83008e0865ec869bc80b920c907f10f (diff) | |
Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
Conflicts:
src/gallium/drivers/Makefile
Diffstat (limited to 'configs/beos')
| -rw-r--r-- | configs/beos | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configs/beos b/configs/beos index 2b74af739d..c6e972789a 100644 --- a/configs/beos +++ b/configs/beos @@ -26,8 +26,8 @@ ifeq ($(CPU), x86) -DUSE_3DNOW_ASM \ -DUSE_SSE_ASM - ASM_SOURCES = $(X86_SOURCES) - ASM_API = $(X86_API) + MESA_ASM_SOURCES = $(X86_SOURCES) + GLAPI_ASM_SOURCES = $(X86_API) CC = gcc CXX = g++ |