summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-07-20 16:11:26 +1000
committerDan Nicholson <dbn.lists@gmail.com>2009-08-04 06:30:30 -0700
commit0ce73f84e9f4d992c1108ce2c84718bc0fcada96 (patch)
tree5ca847e1cd4a1eb2f293b492068c3243faa9db0e
parentfb7cf731f9028c1c53addb6c10c68bd4c1794ae6 (diff)
Add missing X11_INCLUDES to egl/drivers/demo and egl/main.
Compiling mesa on a system with no X headers installed in the default include paths fails due to missing X11 includes. The header includes are picked up by configure but not applied. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Dave Airlie <airlied@redhat.com> (cherry picked from commit 5358e54d1ae64ccfa81199b343a2931b415fcc0a)
-rw-r--r--src/egl/drivers/demo/Makefile2
-rw-r--r--src/egl/main/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/egl/drivers/demo/Makefile b/src/egl/drivers/demo/Makefile
index 26694c92fa..444dfb35bd 100644
--- a/src/egl/drivers/demo/Makefile
+++ b/src/egl/drivers/demo/Makefile
@@ -4,7 +4,7 @@ TOP = ../../../..
include $(TOP)/configs/current
-INCLUDE_DIRS = -I$(TOP)/include -I$(TOP)/src/egl/main
+INCLUDE_DIRS = -I$(TOP)/include -I$(TOP)/src/egl/main $(X11_INCLUDES)
SOURCES = demo.c
diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile
index 8cfa25ca16..fab8f16089 100644
--- a/src/egl/main/Makefile
+++ b/src/egl/main/Makefile
@@ -4,7 +4,7 @@ TOP = ../../..
include $(TOP)/configs/current
-INCLUDE_DIRS = -I$(TOP)/include -I$(TOP)/src/mesa/glapi
+INCLUDE_DIRS = -I$(TOP)/include -I$(TOP)/src/mesa/glapi $(X11_INCLUDES)
HEADERS = \
eglconfig.h \