From 3b9e28d507f77e3c32a29de2d2d4d857d5e5309f Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Mon, 29 Oct 2007 11:17:04 -0700 Subject: linux-dri-xcb: Fix undefined refs when linking with libGL GL_LIB_DEPS was missing -lXdamage and -lXfixes, which was causing linker errors when trying to build the programs. --- configs/linux-dri-xcb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'configs/linux-dri-xcb') diff --git a/configs/linux-dri-xcb b/configs/linux-dri-xcb index 5620fe58e7..3db5293ea4 100644 --- a/configs/linux-dri-xcb +++ b/configs/linux-dri-xcb @@ -41,8 +41,9 @@ EXTRA_LIB_PATH=`pkg-config --libs-only-L x11` LIBDRM_CFLAGS = `pkg-config --cflags libdrm` LIBDRM_LIB = `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) `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx` +GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ + -lm -lpthread -ldl $(LIBDRM_LIB) `pkg-config --libs xcb` \ + `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx` # This is now 0 by default since it seems to confuse the hell out of people -- cgit v1.2.3 From 06ca14543ee3dc4ed35a98db71b0d4a7aa7d9371 Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Mon, 29 Oct 2007 11:21:37 -0700 Subject: Build xdemos programs by default on linux-dri Since libglut is no longer hardcoded, we can build the xdemos programs so long as a GLX enabled libGL and libGLU have been built. --- configs/linux-dri | 4 ++-- configs/linux-dri-xcb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'configs/linux-dri-xcb') diff --git a/configs/linux-dri b/configs/linux-dri index afa2d8ca34..2369f75b07 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -55,10 +55,10 @@ USING_EGL=0 # Directories ifeq ($(USING_EGL), 1) SRC_DIRS = egl glx/x11 mesa glu glut/glx glw -PROGRAM_DIRS = egl +PROGRAM_DIRS = egl xdemos else SRC_DIRS = glx/x11 mesa glu glut/glx glw -PROGRAM_DIRS = +PROGRAM_DIRS = xdemos endif DRIVER_DIRS = dri diff --git a/configs/linux-dri-xcb b/configs/linux-dri-xcb index 3db5293ea4..1f233f07f5 100644 --- a/configs/linux-dri-xcb +++ b/configs/linux-dri-xcb @@ -55,10 +55,10 @@ USING_EGL=0 # Directories ifeq ($(USING_EGL), 1) SRC_DIRS = egl glx/x11 mesa glu glut/glx glw -PROGRAM_DIRS = egl +PROGRAM_DIRS = egl xdemos else SRC_DIRS = glx/x11 mesa glu glut/glx glw -PROGRAM_DIRS = +PROGRAM_DIRS = xdemos endif DRIVER_DIRS = dri -- cgit v1.2.3