Merge remote-tracking branch 'origin/master' into pipe-video

[mesa.git] / configs / linux-opengl-es

diff --git a/configs/linux-opengl-es b/configs/linux-opengl-es
index 566cd758e3ec1a89e981e2f594293cf8bf5a1366..93c0d4770b9d741b92021d769a4bba7323454abb 100644 (file)
--- a/configs/linux-opengl-es
+++ b/configs/linux-opengl-es
@@ -6,8 +6,11 @@ CONFIG_NAME = linux-opengl-es
 
 # Directories to build
 LIB_DIR = lib
-SRC_DIRS = egl glsl mesa/es gallium gallium/winsys
-PROGRAM_DIRS = es1/screen es1/xegl es2/xegl
+SRC_DIRS = egl glsl mapi/es1api mapi/es2api mesa/es \
+       gallium gallium/winsys gallium/targets
+
+# egl st needs this
+DEFINES += -DGLX_DIRECT_RENDERING
 
 # no mesa or egl drivers
 DRIVER_DIRS =
@@ -15,13 +18,11 @@ EGL_DRIVERS_DIRS =
 
 GALLIUM_DRIVERS_DIRS = softpipe
 
-# build egl_softpipe.so
-GALLIUM_WINSYS_DIRS = egl_xlib
-# and libGLES*.so
+# build libGLES*.so
 GALLIUM_STATE_TRACKERS_DIRS = es
 
-# build egl_i915.so
-GALLIUM_DRIVERS_DIRS += trace i915
+# build egl_x11_{swrast,i915}.so
+GALLIUM_DRIVERS_DIRS += trace rbug i915
 GALLIUM_STATE_TRACKERS_DIRS += egl
-GALLIUM_WINSYS_DIRS += drm
-GALLIUM_WINSYS_DRM_DIRS = intel
+GALLIUM_WINSYS_DIRS += drm/intel
+GALLIUM_TARGET_DIRS += egl-swrast egl-i915