diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | configs/freebsd-dri | 3 | ||||
| -rw-r--r-- | configs/linux-dri | 3 | ||||
| -rw-r--r-- | configs/linux-indirect | 48 | ||||
| -rw-r--r-- | src/glx/x11/Makefile | 3 |
5 files changed, 54 insertions, 4 deletions
@@ -89,6 +89,7 @@ linux-dri \ linux-dri-x86 \ linux-dri-x86-64 \ linux-dri-ppc \ +linux-indirect \ linux-fbdev \ linux-glide \ linux-icc \ diff --git a/configs/freebsd-dri b/configs/freebsd-dri index 7d811a539ba..090f3d6b5f0 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 2eb2271be1d..ae0325e4134 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 00000000000..9842eb9d06c --- /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 diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile index ece9384b355..ff35f32f8f9 100644 --- a/src/glx/x11/Makefile +++ b/src/glx/x11/Makefile @@ -5,8 +5,7 @@ include $(TOP)/configs/current # code will not build with DNIO defined. When we finally drop old interface # support in libGL, we need to clean up both glxcmds.c and dri_interface.h. -DEFINES += -DGLX_DIRECT_RENDERING -DGLXEXT -DXF86DRI -DGLX_USE_DLOPEN \ - -DGLX_USE_MESA -DXF86VIDMODE -D_REENTRANT -UIN_DRI_DRIVER +DEFINES += -DXF86VIDMODE -D_REENTRANT -UIN_DRI_DRIVER C_SOURCES = \ $(TOP)/src/mesa/glapi/glapi.c \ |