diff options
| author | Adam Jackson <ajax@freedesktop.org> | 2004-10-25 21:23:08 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@freedesktop.org> | 2004-10-25 21:23:08 +0000 |
| commit | 61702d4afe7ed141dc7a3f39f1933c810cde922e (patch) | |
| tree | e01b9c42629350f00a2069ce43097aa38b271f1f | |
| parent | 312c68fab3c179c6173bd25aae07be09d299ce20 (diff) | |
Add glx/x11 to the DRI configs, and change the Solo configs to build glx/mini.
| -rw-r--r-- | configs/linux-dri | 2 | ||||
| -rw-r--r-- | configs/linux-dri-x86-64 | 2 | ||||
| -rw-r--r-- | configs/linux-solo | 2 | ||||
| -rw-r--r-- | configs/linux-solo-ia64 | 2 | ||||
| -rw-r--r-- | configs/linux-solo-x86 | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/configs/linux-dri b/configs/linux-dri index a1c1c8ef4d..1f6341f1e5 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -34,7 +34,7 @@ GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 # Directories -SRC_DIRS = mesa glu glut/glx glw +SRC_DIRS = mesa glu glut/glx glw glx/x11 DRIVER_DIRS = dri PROGRAM_DIRS = WINDOW_SYSTEM=dri diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64 index 71a1ebbf97..5656e1fcaf 100644 --- a/configs/linux-dri-x86-64 +++ b/configs/linux-dri-x86-64 @@ -24,7 +24,7 @@ GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib64 -lX11 - GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib64 -lXt -lX11 # Directories -SRC_DIRS = mesa glu glut/glx glw +SRC_DIRS = mesa glu glut/glx glw glx/x11 DRIVER_DIRS = dri PROGRAM_DIRS = WINDOW_SYSTEM=dri diff --git a/configs/linux-solo b/configs/linux-solo index bb8cb6a27b..0ee8b832dc 100644 --- a/configs/linux-solo +++ b/configs/linux-solo @@ -25,7 +25,7 @@ GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread # Directories -SRC_DIRS = mesa glx glu glut/mini +SRC_DIRS = mesa glx/mini glu glut/mini DRIVER_DIRS = dri PROGRAM_DIRS = miniglx diff --git a/configs/linux-solo-ia64 b/configs/linux-solo-ia64 index 25e23d19af..d805905701 100644 --- a/configs/linux-solo-ia64 +++ b/configs/linux-solo-ia64 @@ -22,7 +22,7 @@ GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread # Directories -SRC_DIRS = mesa glx glu glut/mini +SRC_DIRS = mesa glx/mini glu glut/mini DRIVER_DIRS = dri PROGRAM_DIRS = miniglx diff --git a/configs/linux-solo-x86 b/configs/linux-solo-x86 index daa65480bd..bb00d1c9b9 100644 --- a/configs/linux-solo-x86 +++ b/configs/linux-solo-x86 @@ -24,7 +24,7 @@ GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread # Directories -SRC_DIRS = mesa glx glu glut/mini +SRC_DIRS = mesa glx/mini glu glut/mini DRIVER_DIRS = dri PROGRAM_DIRS = miniglx |