From 3dd12ccc069790872e95f3f51ddc39991a06242f Mon Sep 17 00:00:00 2001 From: Martin Peres Date: Fri, 13 Apr 2012 20:53:02 +0200 Subject: [PATCH] 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 2c6656bce5e..f05c81d1959 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 50970f9058e..cd0c61080d8 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 -- 2.30.2