projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/gallium-0.1' into gallium-0.2
[mesa.git]
/
configs
/
linux-dri
diff --git
a/configs/linux-dri
b/configs/linux-dri
index eb6f307dac55b6c87df8f4fc0960ed999a572ee0..6a61f0c8dba0d50f87a2e32508c435aa9208a8ec 100644
(file)
--- a/
configs/linux-dri
+++ b/
configs/linux-dri
@@
-55,20
+55,15
@@
SRC_DIRS := glx/x11 egl $(SRC_DIRS)
# Directories
# Directories
-ifeq ($(USING_EGL), 1)
-SRC_DIRS = egl glx/x11 gallium mesa glu glut/glx glw
+SRC_DIRS = egl glx/x11 gallium mesa glu glut/glx glw
PROGRAM_DIRS = egl xdemos
PROGRAM_DIRS = egl xdemos
-else
-SRC_DIRS = glx/x11 gallium mesa glu glut/glx glw
-PROGRAM_DIRS = xdemos
-endif
# EGL directories
# EGL directories
-EGL_DRIVERS_DIRS = demo
dri xdri
+EGL_DRIVERS_DIRS = demo
glx
DRIVER_DIRS =
WINDOW_SYSTEM = dri
DRIVER_DIRS =
WINDOW_SYSTEM = dri
-GALLIUM_WINSYS_DIRS = drm
egl_xlib
+GALLIUM_WINSYS_DIRS = drm
# gamma are missing because they have not been converted to use the new
# interface.
# gamma are missing because they have not been converted to use the new
# interface.