Module: Mesa Branch: gallium-mesa-7.4 Commit: 575a22d47ed76bc411980247ef7628b35e917050 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=575a22d47ed76bc411980247ef7628b35e917050
Author: Alan Hourihane <[email protected]> Date: Tue Feb 10 19:49:10 2009 +0000 update configs for xcb variations --- Makefile | 2 + configs/linux-dri | 4 +- configs/linux-dri-xcb | 68 +++---------------------------------------------- 3 files changed, 8 insertions(+), 66 deletions(-) diff --git a/Makefile b/Makefile index 875f93b..27d2b3a 100644 --- a/Makefile +++ b/Makefile @@ -118,6 +118,8 @@ linux-dri-x86 \ linux-dri-x86-64 \ linux-dri-ppc \ linux-dri-xcb \ +linux-dri-xcb-debug \ +linux-dri-xcb-x86 \ linux-egl \ linux-indirect \ linux-fbdev \ diff --git a/configs/linux-dri b/configs/linux-dri index c667a38..d283626 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -25,7 +25,7 @@ DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \ -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \ -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN -X11_INCLUDES = -I/usr/X11R6/include +X11_INCLUDES = $(shell pkg-config --cflags-only-I x11) CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \ $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS) @@ -41,7 +41,7 @@ CXXFLAGS += -fno-strict-aliasing MESA_ASM_SOURCES = # Library/program dependencies -EXTRA_LIB_PATH=-L/usr/X11R6/lib +EXTRA_LIB_PATH=$(shell pkg-config --libs-only-L x11) LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm) LIBDRM_LIB = $(shell pkg-config --libs libdrm) diff --git a/configs/linux-dri-xcb b/configs/linux-dri-xcb index e9c15a8..5f9abd2 100644 --- a/configs/linux-dri-xcb +++ b/configs/linux-dri-xcb @@ -1,72 +1,12 @@ # -*-makefile-*- # Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others -include $(TOP)/configs/default +include $(TOP)/configs/linux-dri CONFIG_NAME = linux-dri-xcb -# Compiler and flags -CC = gcc -CXX = g++ +DEFINES += -DUSE_XCB -#MKDEP = /usr/X11R6/bin/makedepend -#MKDEP = gcc -M -#MKDEP_OPTIONS = -MF depend +X11_INCLUDES += $(shell pkg-config --cflags-only-I xcb) $(shell pkg-config --cflags-only-I x11-xcb) $(shell pkg-config --cflags-only-I xcb-glx) -OPT_FLAGS = -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 -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \ - -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \ - -DHAVE_ALIAS -DUSE_XCB -DHAVE_POSIX_MEMALIGN - -X11_INCLUDES = $(shell pkg-config --cflags-only-I x11) $(shell pkg-config --cflags-only-I xcb) $(shell pkg-config --cflags-only-I x11-xcb) $(shell pkg-config --cflags-only-I xcb-glx) - -CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \ - $(DEFINES) $(ASM_FLAGS) -std=c99 -ffast-math - -CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) - -# Work around aliasing bugs - developers should comment this out -CFLAGS += -fno-strict-aliasing -CXXFLAGS += -fno-strict-aliasing - -MESA_ASM_SOURCES = - -# Library/program dependencies -EXTRA_LIB_PATH=$(shell pkg-config --libs-only-L x11) - -LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm) -LIBDRM_LIB = $(shell pkg-config --libs libdrm) -DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) -GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \ - $(LIBDRM_LIB) $(shell pkg-config --libs xcb) $(shell pkg-config --libs x11-xcb) $(shell pkg-config --libs xcb-glx) - - -# 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 gallium mesa glu glut/glx glew glw -PROGRAM_DIRS = egl -else -SRC_DIRS = glx/x11 gallium mesa glu glut/glx glew glw -PROGRAM_DIRS = xdemos -endif - -DRIVER_DIRS = dri -WINDOW_SYSTEM=dri - -# gamma are missing because they have not been converted to use the new -# interface. -DRI_DIRS = i810 i915 mach64 mga r128 r200 r300 radeon s3v \ - savage sis tdfx trident unichrome ffb +GL_LIB_DEPS += $(shell pkg-config --libs xcb) $(shell pkg-config --libs x11-xcb) $(shell pkg-config --libs xcb-glx) _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
