summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephane Marchesin <marchesin@icps.u-strasbg.fr>2008-02-15 02:41:34 +0100
committerStephane Marchesin <marchesin@icps.u-strasbg.fr>2008-02-15 02:41:34 +0100
commit903521a6c031757d63b48129d08ba043d183dbdc (patch)
tree6ac94dbb01b42072a65ecd168a3c101e9e5c15b7
parent583f424d61d8080079a55f3c962f647b795d9337 (diff)
nouveau: oops and make nouveau winsys build by default
-rw-r--r--configs/linux-dri2
-rw-r--r--src/mesa/drivers/dri/nouveau_winsys/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/configs/linux-dri b/configs/linux-dri
index 936fce9982..494b0aab8e 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -66,4 +66,4 @@ WINDOW_SYSTEM=dri
# gamma are missing because they have not been converted to use the new
# interface.
-DRI_DIRS = intel_winsys
+DRI_DIRS = intel_winsys nouveau_winsys
diff --git a/src/mesa/drivers/dri/nouveau_winsys/Makefile b/src/mesa/drivers/dri/nouveau_winsys/Makefile
index 59ba561eb9..98ec5a79f5 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/Makefile
+++ b/src/mesa/drivers/dri/nouveau_winsys/Makefile
@@ -8,7 +8,7 @@ MINIGLX_SOURCES =
PIPE_DRIVERS = \
$(TOP)/src/mesa/pipe/softpipe/libsoftpipe.a \
- $(TOP)/src/mesa/pipe/nv40/libnv30.a \
+ $(TOP)/src/mesa/pipe/nv30/libnv30.a \
$(TOP)/src/mesa/pipe/nv40/libnv40.a \
$(TOP)/src/mesa/pipe/nv50/libnv50.a