projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 21b50ce)
targets/{egl-static,gbm}: further clean-up the nvfx remains
authorMartin Peres <martin.peres@labri.fr>
Fri, 13 Apr 2012 18:53:02 +0000 (20:53 +0200)
committerChristoph Bumiller <e0425955@student.tuwien.ac.at>
Sat, 14 Apr 2012 01:12:39 +0000 (03:12 +0200)
src/gallium/targets/egl-static/Makefile patch | blob | history
src/gallium/targets/gbm/Makefile patch | blob | history

diff --git a/src/gallium/targets/egl-static/Makefile b/src/gallium/targets/egl-static/Makefile
index 2c6656bce5e90547a1d1cbd196acf8821914111b..f05c81d1959704dc01dd3adbb2f9676915020a5a 100644 (file)
--- 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 50970f9058e69ba0f0289d5a86d528770e525f3e..cd0c61080d80f5e793e487a6cf4779b24db27db4 100644 (file)
--- 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