[PATCH] egl: Pass flags to locate Xlib headers and libraries

Dan Nicholson dbn.lists at gmail.com
Sun Apr 18 09:33:03 PDT 2010


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.lists at 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


More information about the mesa-dev mailing list