On Mon, Apr 19, 2010 at 12:15:22AM +0800, CSJ wrote:
> Sorry I am not familiar with Makefiles
> But I modified src/egl/drivers/glx/Makefile and
> src/egl/main/Makefile as attached patch file.
>
> and it can compiled passed when configured
> --with-dri-drivers=i915 --disable-gallium --without-demos
>
> if gallium enabled or with demos, it still compiled failed that
> can not find xlib.h
>
> I'll temporarily use this patch to go on compile xserver,
> thanks all :)
Can you try the patch below? This is what I'd like to commit since we
already have the x11.pc values.
--
Dan
>From 520bbf586f8089f21092a9577bc0c0f9f89e8dd3 Mon Sep 17 00:00:00 2001
From: Dan Nicholson <dbn.li...@gmail.com>
Date: Sun, 18 Apr 2010 09:33:03 -0700
Subject: [PATCH] egl: Pass flags to locate Xlib headers and libraries
eglplatform.h pulls in Xlib.h on X11 platforms. Likewise, the egl glx
driver needs to link to libX11. Make sure we use the locations the user
told us about.
Signed-off-by: Dan Nicholson <dbn.li...@gmail.com>
---
src/egl/drivers/glx/Makefile | 4 ++--
src/egl/main/Makefile | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/egl/drivers/glx/Makefile b/src/egl/drivers/glx/Makefile
index 634638f..d976b91 100644
--- a/src/egl/drivers/glx/Makefile
+++ b/src/egl/drivers/glx/Makefile
@@ -10,7 +10,7 @@ EGL_INCLUDES = \
-I$(TOP)/include \
-I$(TOP)/src/egl/main
-EGL_CFLAGS =
-EGL_LIBS = -lX11 -lGL
+EGL_CFLAGS = $(X11_CFLAGS)
+EGL_LIBS = $(X11_LIBS) -lGL
include ../Makefile.template
diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile
index 31f214c..3b4ebf7 100644
--- a/src/egl/main/Makefile
+++ b/src/egl/main/Makefile
@@ -7,7 +7,7 @@ include $(TOP)/configs/current
EGL_MAJOR = 1
EGL_MINOR = 0
-INCLUDE_DIRS = -I$(TOP)/include
+INCLUDE_DIRS = -I$(TOP)/include $(X11_CFLAGS)
HEADERS = \
eglcompiler.h \
--
1.6.6.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
