diff options
| author | Ben Skeggs <[email protected]> | 2008-09-12 20:37:33 +1000 |
|---|---|---|
| committer | Ben Skeggs <[email protected]> | 2008-09-12 20:37:33 +1000 |
| commit | cbe05a4734a7df7dd9d8e52f79d0ed5e6c28ae60 (patch) | |
| tree | e4f67e46334b43f051a0605c7762cac36ad7c1f6 /configs | |
| parent | 522139dd146450edfd3d2f07c627b32512a2c27e (diff) | |
| parent | 81335d0f1760fe172a106f79e81281c1f0d7dedf (diff) | |
Merge remote branch 'nouveau/gallium-0.1' into nouveau-gallium-0.2
Conflicts:
configs/linux-dri
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/default | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/default b/configs/default index 2b0eb196d9e..3b698180bd8 100644 --- a/configs/default +++ b/configs/default @@ -89,7 +89,7 @@ EGL_DRIVERS_DIRS = demo # Gallium directories and 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_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a) GALLIUM_WINSYS_DIRS = xlib egl_xlib |