summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2007-10-29 11:21:37 -0700
committerDan Nicholson <dbn.lists@gmail.com>2007-10-29 11:43:20 -0700
commit06ca14543ee3dc4ed35a98db71b0d4a7aa7d9371 (patch)
tree9b463e947d2cd126eca5e90327e67fb7dae1cf71
parent1421bffb180e2e1a8f0c16f61768805666492ed2 (diff)
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.
-rw-r--r--configs/linux-dri4
-rw-r--r--configs/linux-dri-xcb4
2 files changed, 4 insertions, 4 deletions
diff --git a/configs/linux-dri b/configs/linux-dri
index afa2d8ca34..2369f75b07 100644
--- 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 3db5293ea4..1f233f07f5 100644
--- 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