Mesa (master): targets/{egl-static, gbm}: further clean-up the nvfx remains
Christoph Bumiller
chrisbmr at kemper.freedesktop.org
Fri Apr 13 19:14:34 UTC 2012
Module: Mesa
Branch: master
Commit: 3dd12ccc069790872e95f3f51ddc39991a06242f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3dd12ccc069790872e95f3f51ddc39991a06242f
Author: Martin Peres <martin.peres at labri.fr>
Date: Fri Apr 13 20:53:02 2012 +0200
targets/{egl-static,gbm}: further clean-up the nvfx remains
---
src/gallium/targets/egl-static/Makefile | 2 +-
src/gallium/targets/gbm/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gallium/targets/egl-static/Makefile b/src/gallium/targets/egl-static/Makefile
index 2c6656b..f05c81d 100644
--- a/src/gallium/targets/egl-static/Makefile
+++ b/src/gallium/targets/egl-static/Makefile
@@ -101,7 +101,7 @@ ifneq ($(findstring nouveau/drm,$(GALLIUM_WINSYS_DIRS)),)
egl_CPPFLAGS += -D_EGL_PIPE_NOUVEAU=1
egl_LIBS += \
$(TOP)/src/gallium/winsys/nouveau/drm/libnouveaudrm.a \
- $(TOP)/src/gallium/drivers/nvfx/libnvfx.a \
+ $(TOP)/src/gallium/drivers/nv30/libnv30.a \
$(TOP)/src/gallium/drivers/nv50/libnv50.a \
$(TOP)/src/gallium/drivers/nvc0/libnvc0.a \
$(TOP)/src/gallium/drivers/nouveau/libnouveau.a
diff --git a/src/gallium/targets/gbm/Makefile b/src/gallium/targets/gbm/Makefile
index 50970f9..cd0c610 100644
--- a/src/gallium/targets/gbm/Makefile
+++ b/src/gallium/targets/gbm/Makefile
@@ -62,7 +62,7 @@ i915_SYS = -ldrm_intel
# nouveau pipe driver
nouveau_LIBS = \
$(TOP)/src/gallium/winsys/nouveau/drm/libnouveaudrm.a \
- $(TOP)/src/gallium/drivers/nvfx/libnvfx.a \
+ $(TOP)/src/gallium/drivers/nv30/libnv30.a \
$(TOP)/src/gallium/drivers/nv50/libnv50.a \
$(TOP)/src/gallium/drivers/nvc0/libnvc0.a \
$(TOP)/src/gallium/drivers/nouveau/libnouveau.a
More information about the mesa-commit
mailing list