From: Ben Skeggs <skeggsb@gmail.com>
Date: Sun, 13 Jul 2008 15:14:52 +0000 (+1000)
Subject: Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=commitdiff_plain;h=d68a3ebf0e7e853cf9680ddbb095fffe7c0fb1f9

Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
---

d68a3ebf0e7e853cf9680ddbb095fffe7c0fb1f9
diff --cc configs/default
index c1bc5fb01d0,ef9c5fda1eb..8c6ae848406
--- a/configs/default
+++ b/configs/default
@@@ -68,9 -68,9 +68,9 @@@ PROGRAM_DIRS = demos redbook samples gl
  
  
  # Gallium directories and 
- GALLIUM_AUXILIARY_DIRS = draw cso_cache pipebuffer tgsi sct translate rtasm util
+ GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct 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 nv04 nv10 nv30 nv40 nv50 failover
  GALLIUM_WINSYS_COMMON_DIRS =
  GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
  GALLIUM_WINSYS_DIRS = xlib egl_xlib