summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--progs/egl/Makefile2
-rw-r--r--src/egl/drivers/glx/Makefile4
-rw-r--r--src/egl/main/Makefile2
-rw-r--r--src/gallium/state_trackers/egl/Makefile1
4 files changed, 5 insertions, 4 deletions
diff --git a/progs/egl/Makefile b/progs/egl/Makefile
index 8dfcb4eabcb..fe490c2f8ea 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 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 \
diff --git a/src/gallium/state_trackers/egl/Makefile b/src/gallium/state_trackers/egl/Makefile
index 794785006f5..1768241352f 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) \