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 de4ee20578)

Conflicts:

	src/gallium/winsys/xlib/Makefile
This commit is contained in:
Dan Nicholson 2010-04-02 06:33:48 -07:00
parent 3b693fd93f
commit 4f8bf353bd
2 changed files with 4 additions and 2 deletions

View File

@ -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 \

View File

@ -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