Module: Mesa
Branch: master
Commit: de4ee20578a79e024b0de83c40648112f42c994e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=de4ee20578a79e024b0de83c40648112f42c994e
Author: Dan Nicholson <dbn.li...@gmail.com>
Date: Sat Mar 13 11:56:59 2010 -0800
gallium: Respect user's CFLAGS for including X headers
This can break on systems that don't have a system X installation.
Signed-off-by: Dan Nicholson <dbn.li...@gmail.com>
---
src/gallium/state_trackers/glx/xlib/Makefile | 3 ++-
src/gallium/winsys/xlib/Makefile | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/gallium/state_trackers/glx/xlib/Makefile
b/src/gallium/state_trackers/glx/xlib/Makefile
index 7b2adc6..8c7cc52 100644
--- a/src/gallium/state_trackers/glx/xlib/Makefile
+++ b/src/gallium/state_trackers/glx/xlib/Makefile
@@ -5,7 +5,8 @@ LIBNAME = xlib
LIBRARY_INCLUDES = \
-I$(TOP)/include \
- -I$(TOP)/src/mesa
+ -I$(TOP)/src/mesa \
+ $(X_CFLAGS)
C_SOURCES = \
glx_api.c \
diff --git a/src/gallium/winsys/xlib/Makefile b/src/gallium/winsys/xlib/Makefile
index 68542b4..18357a4 100644
--- a/src/gallium/winsys/xlib/Makefile
+++ b/src/gallium/winsys/xlib/Makefile
@@ -6,7 +6,8 @@ LIBNAME = ws_xlib
LIBRARY_INCLUDES = \
-I$(TOP)/src/gallium/include \
-I$(TOP)/src/gallium/drivers \
- -I$(TOP)/src/gallium/auxiliary
+ -I$(TOP)/src/gallium/auxiliary \
+ $(X_CFLAGS)
C_SOURCES = \
xlib_sw_winsys.c
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
