diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2010-04-18 09:33:03 -0700 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2010-04-19 20:21:57 -0700 |
| commit | 88be2171e7336201e5ee97ade36ba3de4fe939bf (patch) | |
| tree | cf96ceef99bc18ae43e59888a032a8005de73481 /src | |
| parent | 8e5effefc7e1cf147315841894d1548f09b96cbc (diff) | |
| download | external_mesa3d-88be2171e7336201e5ee97ade36ba3de4fe939bf.zip external_mesa3d-88be2171e7336201e5ee97ade36ba3de4fe939bf.tar.gz external_mesa3d-88be2171e7336201e5ee97ade36ba3de4fe939bf.tar.bz2 | |
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@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/egl/drivers/glx/Makefile | 4 | ||||
| -rw-r--r-- | src/egl/main/Makefile | 2 | ||||
| -rw-r--r-- | src/gallium/state_trackers/egl/Makefile | 1 |
3 files changed, 4 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 \ 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) \ |