diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2010-04-19 20:22:48 -0700 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2010-04-19 20:22:48 -0700 |
| commit | 02224ec4e0de8072c9d730821f88e0a00212ff50 (patch) | |
| tree | 565fe9ab2c6380cd81ead1ef468888a837c2edd5 /src/gallium/targets/libgl-xlib | |
| parent | 35e60aed0bcc63d906dfdd64fe5014b2ca4394f0 (diff) | |
| parent | 88be2171e7336201e5ee97ade36ba3de4fe939bf (diff) | |
Merge branch '7.8'
Conflicts:
progs/egl/Makefile
progs/egl/Makefile is gone on master with the egl demos split into
subdirectories. Will require an additional commit.
Diffstat (limited to 'src/gallium/targets/libgl-xlib')
| -rw-r--r-- | src/gallium/targets/libgl-xlib/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/targets/libgl-xlib/Makefile b/src/gallium/targets/libgl-xlib/Makefile index 6cd00cad458..add3a273945 100644 --- a/src/gallium/targets/libgl-xlib/Makefile +++ b/src/gallium/targets/libgl-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 \ + $(X11_CFLAGS) DEFINES += \ -DGALLIUM_SOFTPIPE |