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/linux-dri-xcb | |
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/linux-dri-xcb')
-rw-r--r-- | configs/linux-dri-xcb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/linux-dri-xcb b/configs/linux-dri-xcb index ea4bdf1864..fbf9b9b268 100644 --- a/configs/linux-dri-xcb +++ b/configs/linux-dri-xcb @@ -33,7 +33,7 @@ CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \ CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) -ASM_SOURCES = +MESA_ASM_SOURCES = # Library/program dependencies EXTRA_LIB_PATH=$(shell pkg-config --libs-only-L x11) |