Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Wed, 23 Apr 2008 02:39:38 +0000 (12:39 +1000)
committerBen Skeggs <skeggsb@gmail.com>
Wed, 23 Apr 2008 02:39:38 +0000 (12:39 +1000)
1  2 
configs/default

diff --cc configs/default
index d010721a103c0c05ba5de5fb45e4b2014b2659ec,04604f8006717ed709f16fcf7ee537b9a0df300d..732ffeb16098ea44dddb517722cfb842d5bb42cb
@@@ -68,9 -68,9 +68,9 @@@ PROGRAM_DIRS = demos redbook samples gl
  
  
  # Gallium directories and 
- GALLIUM_AUXILIARY_DIRS = draw cso_cache pipebuffer tgsi rtasm util sct
+ GALLIUM_AUXILIARY_DIRS = draw cso_cache pipebuffer tgsi sct translate rtasm util
  GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
 -GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple failover
 +GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv10 nv30 nv40 nv50 failover
  GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
  GALLIUM_WINSYS_DIRS = xlib