progs/es: Link to libX11.

[android-x86/external-mesa.git] / configs / linux-dri

diff --git a/configs/linux-dri b/configs/linux-dri
index 6a61f0c..0998ba8 100644 (file)
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -52,26 +52,16 @@ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
 
 # Directories
 SRC_DIRS := glx/x11 egl $(SRC_DIRS)
-
-
-# Directories
-SRC_DIRS = egl glx/x11 gallium mesa glu glut/glx glw 
-PROGRAM_DIRS = egl xdemos
+PROGRAM_DIRS := egl $(PROGRAM_DIRS)
 
 # EGL directories
 EGL_DRIVERS_DIRS = demo glx
 
-DRIVER_DIRS =
+DRIVER_DIRS = dri
 WINDOW_SYSTEM = dri
-GALLIUM_WINSYS_DIRS = drm 
-
-# gamma are missing because they have not been converted to use the new
-# interface.
-
-# XXX: need to figure out a way for gallium and non-gallium builds to
-# coexist:
-#
+GALLIUM_WINSYS_DIRS = drm
+GALLIUM_WINSYS_DRM_DIRS = intel
+GALLIUM_STATE_TRACKERS_DIRS = egl
 
-#DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
-#      savage sis tdfx trident unichrome ffb
-DRI_DIRS = intel 
+DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
+       savage sis tdfx trident unichrome ffb swrast