Mesa (master): egl: Check for drm winsys not just the driver name
Jakob Bornecrantz
wallbraker at kemper.freedesktop.org
Tue Jun 29 17:26:30 UTC 2010
Module: Mesa
Branch: master
Commit: 172f3f5eac62fafcd0d97a9859eb2049b1e18424
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=172f3f5eac62fafcd0d97a9859eb2049b1e18424
Author: Jakob Bornecrantz <jakob at vmware.com>
Date: Tue Jun 29 18:21:00 2010 +0100
egl: Check for drm winsys not just the driver name
Also fix pipe_radeon.so not building
---
src/gallium/targets/egl/Makefile | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/gallium/targets/egl/Makefile b/src/gallium/targets/egl/Makefile
index 8f9eb52..f1259a5 100644
--- a/src/gallium/targets/egl/Makefile
+++ b/src/gallium/targets/egl/Makefile
@@ -141,19 +141,19 @@ OpenVG_LIBS := $(TOP)/src/gallium/state_trackers/vega/libvega.a
OUTPUT_PATH := $(TOP)/$(LIB_DIR)/egl
# determine the outputs
-ifneq ($(findstring i915,$(GALLIUM_WINSYS_DIRS)),)
+ifneq ($(findstring i915/drm,$(GALLIUM_WINSYS_DIRS)),)
OUTPUTS += i915
endif
-ifneq ($(findstring i965,$(GALLIUM_WINSYS_DIRS)),)
+ifneq ($(findstring i965/drm,$(GALLIUM_WINSYS_DIRS)),)
OUTPUTS += i965
endif
-ifneq ($(findstring nouveau,$(GALLIUM_WINSYS_DIRS)),)
+ifneq ($(findstring nouveau/drm,$(GALLIUM_WINSYS_DIRS)),)
OUTPUTS += nouveau
endif
-ifneq ($(findstring r300,$(GALLIUM_WINSYS_DIRS)),)
+ifneq ($(findstring radeon/drm,$(GALLIUM_WINSYS_DIRS)),)
OUTPUTS += radeon
endif
-ifneq ($(findstring svga,$(GALLIUM_WINSYS_DIRS)),)
+ifneq ($(findstring svga/drm,$(GALLIUM_WINSYS_DIRS)),)
OUTPUTS += vmwgfx
endif
OUTPUTS += swrast
More information about the mesa-commit
mailing list