Merge branch 'mesa_7_7_branch'

[mesa.git] / configs / linux-dri

diff --git a/configs/linux-dri b/configs/linux-dri
index c667a386f3926456065069c5a240c07cebf29d3b..95f77ade1dd2301e60618dd19a910d3ec246fc2f 100644 (file)
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -55,18 +55,19 @@ SRC_DIRS := glx/x11 egl $(SRC_DIRS)
 PROGRAM_DIRS := egl $(PROGRAM_DIRS)
 
 # EGL directories
-EGL_DRIVERS_DIRS = demo glx
+EGL_DRIVERS_DIRS = glx
 
-DRIVER_DIRS =
+DRIVER_DIRS = dri
 WINDOW_SYSTEM = dri
-GALLIUM_WINSYS_DIRS = drm 
+GALLIUM_WINSYS_DIRS = drm
+GALLIUM_WINSYS_DRM_DIRS = vmware intel i965
+GALLIUM_STATE_TRACKERS_DIRS = egl
 
-# gamma are missing because they have not been converted to use the new
-# interface.
+DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon \
+       savage sis tdfx unichrome ffb swrast
 
-# XXX: need to figure out a way for gallium and non-gallium builds to
-# coexist:
-#
+INTEL_LIBS = `pkg-config --libs libdrm_intel`
+INTEL_CFLAGS = `pkg-config --cflags libdrm_intel`
 
-#DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
-#      savage sis tdfx trident unichrome ffb
+RADEON_LIBS = `pkg-config --libs libdrm_radeon`
+RADEON_CFLAGS = `pkg-config --cflags libdrm_radeon`