From: Ben Skeggs <skeggsb@gmail.com>
Date: Wed, 23 Apr 2008 02:39:38 +0000 (+1000)
Subject: Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=104ff59585ad1888c8cef5ad9de0e2fdb3f48c21;p=mesa.git

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

104ff59585ad1888c8cef5ad9de0e2fdb3f48c21
diff --cc configs/default
index d010721a103,04604f80067..732ffeb1609
--- 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 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