Build xdemos programs by default on linux-dri

Since libglut is no longer hardcoded, we can build the xdemos programs
so long as a GLX enabled libGL and libGLU have been built.

diff --git a/configs/linux-dri b/configs/linux-dri
index afa2d8ca34631206fc4144713e9b8c1320b94b6d..2369f75b07de733b02ce55041c506e5d473a974a 100644 (file)
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -55,10 +55,10 @@ USING_EGL=0
 # Directories
 ifeq ($(USING_EGL), 1)
 SRC_DIRS = egl glx/x11 mesa glu glut/glx glw
-PROGRAM_DIRS = egl
+PROGRAM_DIRS = egl xdemos
 else
 SRC_DIRS = glx/x11 mesa glu glut/glx glw
-PROGRAM_DIRS =
+PROGRAM_DIRS = xdemos
 endif
 
 DRIVER_DIRS = dri

diff --git a/configs/linux-dri-xcb b/configs/linux-dri-xcb
index 3db5293ea49b7175d11efdefd0b48cf9a93e4332..1f233f07f588332d2cf5d062efd7024b4c5f5570 100644 (file)
--- a/configs/linux-dri-xcb
+++ b/configs/linux-dri-xcb
@@ -55,10 +55,10 @@ USING_EGL=0
 # Directories
 ifeq ($(USING_EGL), 1)
 SRC_DIRS = egl glx/x11 mesa glu glut/glx glw
-PROGRAM_DIRS = egl
+PROGRAM_DIRS = egl xdemos
 else
 SRC_DIRS = glx/x11 mesa glu glut/glx glw
-PROGRAM_DIRS =
+PROGRAM_DIRS = xdemos
 endif
 
 DRIVER_DIRS = dri