summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2010-04-02 06:33:48 -0700
committerDan Nicholson <dbn.lists@gmail.com>2010-04-19 20:21:57 -0700
commit4f8bf353bd7e896268e0eb445c61270a8823892a (patch)
tree99fde9ac251099e12566932de637504f39a2ce7a /src
parent3b693fd93fbddc24360ed345a832387834e0a1fc (diff)
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.lists@gmail.com> (cherry picked from commit de4ee20578a79e024b0de83c40648112f42c994e) Conflicts: src/gallium/winsys/xlib/Makefile
Diffstat (limited to 'src')
-rw-r--r--src/gallium/state_trackers/glx/xlib/Makefile3
-rw-r--r--src/gallium/winsys/xlib/Makefile3
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 7b2adc62c3..8c7cc524df 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 824c666ae3..76f073e38d 100644
--- a/src/gallium/winsys/xlib/Makefile
+++ b/src/gallium/winsys/xlib/Makefile
@@ -20,7 +20,8 @@ INCLUDE_DIRS = \
-I$(TOP)/src/gallium/include \
-I$(TOP)/src/gallium/drivers \
-I$(TOP)/src/gallium/state_trackers/glx/xlib \
- -I$(TOP)/src/gallium/auxiliary
+ -I$(TOP)/src/gallium/auxiliary \
+ $(X_CFLAGS)
DEFINES += \
-DGALLIUM_SOFTPIPE