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.
This commit is contained in:
parent
4508bcc72c
commit
dc6e2c778a
1
Makefile
1
Makefile
|
@ -89,6 +89,7 @@ linux-dri \
|
||||||
linux-dri-x86 \
|
linux-dri-x86 \
|
||||||
linux-dri-x86-64 \
|
linux-dri-x86-64 \
|
||||||
linux-dri-ppc \
|
linux-dri-ppc \
|
||||||
|
linux-indirect \
|
||||||
linux-fbdev \
|
linux-fbdev \
|
||||||
linux-glide \
|
linux-glide \
|
||||||
linux-icc \
|
linux-icc \
|
||||||
|
|
|
@ -13,7 +13,8 @@ OPT_FLAGS = -O
|
||||||
|
|
||||||
EXPAT_INCLUDES = -I/usr/local/include
|
EXPAT_INCLUDES = -I/usr/local/include
|
||||||
X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
|
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 \
|
CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC \
|
||||||
-ffast-math $(X11_INCLUDES)
|
-ffast-math $(X11_INCLUDES)
|
||||||
CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC
|
CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC
|
||||||
|
|
|
@ -22,7 +22,8 @@ ARCH_FLAGS ?=
|
||||||
|
|
||||||
DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
|
DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
|
||||||
-D_BSD_SOURCE -D_GNU_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
|
X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
|
||||||
|
|
||||||
|
|
|
@ -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
|
|
@ -5,8 +5,7 @@ include $(TOP)/configs/current
|
||||||
# code will not build with DNIO defined. When we finally drop old interface
|
# 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.
|
# support in libGL, we need to clean up both glxcmds.c and dri_interface.h.
|
||||||
|
|
||||||
DEFINES += -DGLX_DIRECT_RENDERING -DGLXEXT -DXF86DRI -DGLX_USE_DLOPEN \
|
DEFINES += -DXF86VIDMODE -D_REENTRANT -UIN_DRI_DRIVER
|
||||||
-DGLX_USE_MESA -DXF86VIDMODE -D_REENTRANT -UIN_DRI_DRIVER
|
|
||||||
|
|
||||||
C_SOURCES = \
|
C_SOURCES = \
|
||||||
$(TOP)/src/mesa/glapi/glapi.c \
|
$(TOP)/src/mesa/glapi/glapi.c \
|
||||||
|
|
Loading…
Reference in New Issue