Mesa (master): egl: Pass flags to locate Xlib headers and libraries
Dan Nicholson
dbn at kemper.freedesktop.org
Tue Apr 20 03:29:30 UTC 2010
Module: Mesa
Branch: master
Commit: 88be2171e7336201e5ee97ade36ba3de4fe939bf
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=88be2171e7336201e5ee97ade36ba3de4fe939bf
Author: Dan Nicholson <dbn.lists at gmail.com>
Date: Sun Apr 18 09:33:03 2010 -0700
egl: Pass flags to locate Xlib headers and libraries
eglplatform.h pulls in Xlib.h on X11 platforms. Likewise, the egl glx
driver and egl programs 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>
---
progs/egl/Makefile | 2 +-
src/egl/drivers/glx/Makefile | 4 ++--
src/egl/main/Makefile | 2 +-
src/gallium/state_trackers/egl/Makefile | 1 +
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/progs/egl/Makefile b/progs/egl/Makefile
index 8dfcb4e..fe490c2 100644
--- a/progs/egl/Makefile
+++ b/progs/egl/Makefile
@@ -4,7 +4,7 @@ TOP = ../..
include $(TOP)/configs/current
-INCLUDE_DIRS = -I$(TOP)/include
+INCLUDE_DIRS = -I$(TOP)/include $(X11_CFLAGS)
HEADERS = $(TOP)/include/GLES/egl.h
LIB_DEP = $(TOP)/$(LIB_DIR)/libEGL.so
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 \
diff --git a/src/gallium/state_trackers/egl/Makefile b/src/gallium/state_trackers/egl/Makefile
index 7947850..1768241 100644
--- a/src/gallium/state_trackers/egl/Makefile
+++ b/src/gallium/state_trackers/egl/Makefile
@@ -16,6 +16,7 @@ x11_INCLUDES = \
-I$(TOP)/src/gallium/drivers \
-I$(TOP)/src/glx \
-I$(TOP)/src/mesa \
+ $(X11_CFLAGS) \
$(shell pkg-config --cflags-only-I libdrm)
x11_SOURCES = $(wildcard x11/*.c) \
More information about the mesa-commit
mailing list