Mesa (mesa_7_5_branch): Add missing X11_INCLUDES to egl/drivers/ demo and egl/main.
Dan Nicholson
dbn at kemper.freedesktop.org
Tue Aug 4 13:33:26 UTC 2009
Module: Mesa
Branch: mesa_7_5_branch
Commit: 0ce73f84e9f4d992c1108ce2c84718bc0fcada96
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0ce73f84e9f4d992c1108ce2c84718bc0fcada96
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Mon Jul 20 16:11:26 2009 +1000
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 at who-t.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
(cherry picked from commit 5358e54d1ae64ccfa81199b343a2931b415fcc0a)
---
src/egl/drivers/demo/Makefile | 2 +-
src/egl/main/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/egl/drivers/demo/Makefile b/src/egl/drivers/demo/Makefile
index 26694c9..444dfb3 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 8cfa25c..fab8f16 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 \
More information about the mesa-commit
mailing list