summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2005-07-29 17:25:50 +0000
committerIan Romanick <idr@us.ibm.com>2005-07-29 17:25:50 +0000
commitdc6e2c778aa0e67b68fa02043443bfad4dbbccbf (patch)
treea5be22de89bc4b277879a06e88a285fe63222f3a /configs
parent4508bcc72c96d468ea121f75e33500a9359a786e (diff)
Add a new config called linux-indirect. This build the GLX libGL just like
linux-dri, but it disables support for direct-rendering in it. This config mainly exists so that I can verify that changes to libGL haven't broken builds on non-DRI platforms.
Diffstat (limited to 'configs')
-rw-r--r--configs/freebsd-dri3
-rw-r--r--configs/linux-dri3
-rw-r--r--configs/linux-indirect48
3 files changed, 52 insertions, 2 deletions
diff --git a/configs/freebsd-dri b/configs/freebsd-dri
index 7d811a539b..090f3d6b5f 100644
--- a/configs/freebsd-dri
+++ b/configs/freebsd-dri
@@ -13,7 +13,8 @@ OPT_FLAGS = -O
EXPAT_INCLUDES = -I/usr/local/include
X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
-DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER
+DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
+ -DGLX_DIRECT_RENDERING
CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC \
-ffast-math $(X11_INCLUDES)
CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC
diff --git a/configs/linux-dri b/configs/linux-dri
index 2eb2271be1..ae0325e413 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -22,7 +22,8 @@ ARCH_FLAGS ?=
DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-D_BSD_SOURCE -D_GNU_SOURCE \
- -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER
+ -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
+ -DGLX_DIRECT_RENDERING
X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
diff --git a/configs/linux-indirect b/configs/linux-indirect
new file mode 100644
index 0000000000..9842eb9d06
--- /dev/null
+++ b/configs/linux-indirect
@@ -0,0 +1,48 @@
+# -*-makefile-*-
+# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = linux-dri
+
+# Compiler and flags
+CC = gcc
+CXX = g++
+
+MKDEP = /usr/X11R6/bin/makedepend
+#MKDEP = gcc -M
+#MKDEP_OPTIONS = -MF depend
+
+WARN_FLAGS = -Wall
+OPT_FLAGS = -O -g
+PIC_FLAGS = -fPIC
+
+# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
+ARCH_FLAGS ?=
+
+DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
+ -D_BSD_SOURCE -D_GNU_SOURCE \
+ -DPTHREADS
+
+X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
+
+CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
+ $(ASM_FLAGS) -std=c99 -ffast-math
+
+CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
+
+
+ASM_SOURCES =
+
+# Library/program dependencies
+EXTRA_LIB_PATH=-L/usr/X11R6/lib
+
+DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl
+GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
+
+
+# Directories
+SRC_DIRS = glx/x11 glu glut/glx glw
+DRIVER_DIRS =
+PROGRAM_DIRS =
+WINDOW_SYSTEM=dri