summaryrefslogtreecommitdiffstats
path: root/src/egl
diff options
context:
space:
mode:
authorDan Nicholson <[email protected]>2010-04-18 09:33:03 -0700
committerDan Nicholson <[email protected]>2010-04-19 20:21:57 -0700
commit88be2171e7336201e5ee97ade36ba3de4fe939bf (patch)
treecf96ceef99bc18ae43e59888a032a8005de73481 /src/egl
parent8e5effefc7e1cf147315841894d1548f09b96cbc (diff)
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 <[email protected]>
Diffstat (limited to 'src/egl')
-rw-r--r--src/egl/drivers/glx/Makefile4
-rw-r--r--src/egl/main/Makefile2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/egl/drivers/glx/Makefile b/src/egl/drivers/glx/Makefile
index 634638f5387..d976b91a74e 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 31f214cf6f2..3b4ebf7fec4 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 \