diff options
| author | Jakob Bornecrantz <jakob@vmware.com> | 2010-03-16 13:44:32 +0000 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@vmware.com> | 2010-03-24 17:02:17 +0100 |
| commit | 41d2ebf2020311eb032882d9b0bd1efe916f1feb (patch) | |
| tree | 576008f03db2b506133b5303059a5579ab012681 /configs | |
| parent | 01f7acb700789abacca21e89400f57375eb82499 (diff) | |
gallium: Remove GALLIUM_WINSYS_DRM_DIRS
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/autoconf.in | 1 | ||||
| -rw-r--r-- | configs/default | 3 | ||||
| -rw-r--r-- | configs/linux-dri | 3 | ||||
| -rw-r--r-- | configs/linux-opengl-es | 3 |
4 files changed, 3 insertions, 7 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in index 66c1ee48e87..b6cc9b3b73e 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -76,7 +76,6 @@ GALLIUM_DIRS = @GALLIUM_DIRS@ GALLIUM_DRIVERS_DIRS = @GALLIUM_DRIVERS_DIRS@ GALLIUM_WINSYS_DIRS = @GALLIUM_WINSYS_DIRS@ GALLIUM_TARGET_DIRS = @GALLIUM_TARGET_DIRS@ -GALLIUM_WINSYS_DRM_DIRS = @GALLIUM_WINSYS_DRM_DIRS@ GALLIUM_STATE_TRACKERS_DIRS = @GALLIUM_STATE_TRACKERS_DIRS@ GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a) diff --git a/configs/default b/configs/default index 8fbf8dd219a..03feed973a2 100644 --- a/configs/default +++ b/configs/default @@ -100,9 +100,8 @@ GALLIUM_DIRS = auxiliary drivers state_trackers GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a GALLIUM_DRIVERS_DIRS = softpipe failover svga i915 i965 r300 trace identity GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a) -GALLIUM_WINSYS_DIRS = null xlib drm +GALLIUM_WINSYS_DIRS = null xlib drm/swrast GALLIUM_TARGET_DIRS = libgl-xlib -GALLIUM_WINSYS_DRM_DIRS = swrast GALLIUM_STATE_TRACKERS_DIRS = glx vega # native displays EGL should support diff --git a/configs/linux-dri b/configs/linux-dri index d362fd8b377..e10021d7994 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -58,9 +58,8 @@ PROGRAM_DIRS := egl $(PROGRAM_DIRS) EGL_DRIVERS_DIRS = glx DRIVER_DIRS = dri -GALLIUM_WINSYS_DIRS = null xlib drm +GALLIUM_WINSYS_DIRS = null xlib drm/vmware drm/intel drm/i965 GALLIUM_TARGET_DIRS = -GALLIUM_WINSYS_DRM_DIRS = vmware intel i965 GALLIUM_STATE_TRACKERS_DIRS = egl DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon \ diff --git a/configs/linux-opengl-es b/configs/linux-opengl-es index 76054aad14e..ddcb717f836 100644 --- a/configs/linux-opengl-es +++ b/configs/linux-opengl-es @@ -24,5 +24,4 @@ GALLIUM_STATE_TRACKERS_DIRS = es # build egl_x11_{swrast,i915}.so GALLIUM_DRIVERS_DIRS += trace i915 GALLIUM_STATE_TRACKERS_DIRS += egl -GALLIUM_WINSYS_DIRS += drm -GALLIUM_WINSYS_DRM_DIRS += intel swrast +GALLIUM_WINSYS_DIRS += drm/intel drm/swrast |