From: Corbin Simpson <MostAwesomeDude@gmail.com>
Date: Fri, 6 Feb 2009 21:34:04 +0000 (-0800)
Subject: Merge branch 'gallium-0.2-radeon' into gallium-0.2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4683fc94f5e03f596fc8e5c12e9dd54a83deaeb9;p=mesa.git

Merge branch 'gallium-0.2-radeon' into gallium-0.2
---

4683fc94f5e03f596fc8e5c12e9dd54a83deaeb9
diff --cc configs/default
index 13bda58f188,659b1989d21..cda9a5b0370
--- a/configs/default
+++ b/configs/default
@@@ -89,9 -89,9 +89,9 @@@ PROGRAM_DIRS = demos redbook samples gl
  EGL_DRIVERS_DIRS = demo
  
  # Gallium directories and 
 -GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct rtasm util
 +GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct rtasm util indices
  GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
- GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv04 nv10 nv20 nv30 nv40 nv50 failover trace
+ GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv04 nv10 nv20 nv30 nv40 nv50 failover
  GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
  GALLIUM_WINSYS_DIRS = xlib egl_xlib