summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2005-08-15 15:01:39 +0000
committerIan Romanick <idr@us.ibm.com>2005-08-15 15:01:39 +0000
commita3dd6efb0009110fdd8154640af51e4b15ad625c (patch)
tree3f73f8aa139dd3d2a8253853c35bb17ea00186e4 /configs
parentdabec11d277e68b6940e741651e61102767240b9 (diff)
Put back '-I/usr/X11R6/include'.
Make 'USING_EGL=0' the default for now. It's causing too much confusion for too many non-developers (which in turn wastes too much developer time). It is trivially overridden from the make command line. See comments in linux-dri.
Diffstat (limited to 'configs')
-rw-r--r--configs/linux-dri17
-rw-r--r--configs/linux-indirect2
2 files changed, 17 insertions, 2 deletions
diff --git a/configs/linux-dri b/configs/linux-dri
index 3235fcf4c57..9817a0e762d 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -25,6 +25,8 @@ DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
-DGLX_DIRECT_RENDERING -DHAVE_ALIAS
+X11_INCLUDES = -I/usr/X11R6/include
+
CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
$(ASM_FLAGS) -std=c99 -ffast-math
@@ -40,12 +42,23 @@ DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
+# This is now 0 by default since it seems to confuse the hell out of people
+# and generate a lot of extra noise on bugzilla. If you need to build with
+# EGL, do 'make linux-dri USING_EGL=1'
+
+USING_EGL=0
+
# Directories
+ifeq ($(USING_EGL), 1)
SRC_DIRS = egl glx/x11 mesa glu glut/glx glw
-DRIVER_DIRS = dri
PROGRAM_DIRS = egl
+else
+SRC_DIRS = glx/x11 mesa glu glut/glx glw
+PROGRAM_DIRS =
+endif
+
+DRIVER_DIRS = dri
WINDOW_SYSTEM=dri
-USING_EGL=1
# gamma are missing because they have not been converted to use the new
# interface.
diff --git a/configs/linux-indirect b/configs/linux-indirect
index a5c69955b3a..93166e2e98d 100644
--- a/configs/linux-indirect
+++ b/configs/linux-indirect
@@ -25,6 +25,8 @@ DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-D_BSD_SOURCE -D_GNU_SOURCE \
-DPTHREADS -DHAVE_ALIAS
+X11_INCLUDES = -I/usr/X11R6/include
+
CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
$(ASM_FLAGS) -std=c99 -ffast-math