Merge branch 'gallium-0.2-radeon' into gallium-0.2
authorCorbin Simpson <MostAwesomeDude@gmail.com>
Fri, 6 Feb 2009 21:34:04 +0000 (13:34 -0800)
committerCorbin Simpson <MostAwesomeDude@gmail.com>
Fri, 6 Feb 2009 21:34:04 +0000 (13:34 -0800)
1  2 
configs/default

diff --cc configs/default
index 13bda58f1887ca175097597e292708d9c2cb0c5d,659b1989d21bb13e42aa3f398216db376a0c395c..cda9a5b03704f66c4c6757f675b573a31dcd5c07
@@@ -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