diff options
| author | Keith Whitwell <keithw@vmware.com> | 2010-03-14 22:54:51 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2010-03-14 22:54:51 +0000 |
| commit | 9bfa07afe179f8060e7beefb754a29c4d9c6e349 (patch) | |
| tree | 054af5e4b2fd8b74ad60ccd9b9b5a0821c78680e /src/gallium/state_trackers | |
| parent | 65757a143f8e3fcd7afbc1ff92db44a823edf46c (diff) | |
| parent | 08cddfe2912ec6f8cb2a54dfa5ae12f755e549f8 (diff) | |
Merge commit 'origin/master' into gallium-resources
Conflicts:
src/gallium/drivers/llvmpipe/lp_rast.c
src/gallium/drivers/llvmpipe/lp_scene.c
src/gallium/drivers/llvmpipe/lp_texture.c
src/gallium/drivers/llvmpipe/lp_texture.h
src/gallium/drivers/softpipe/sp_texture.c
src/gallium/drivers/svga/svga_screen_texture.c
Diffstat (limited to 'src/gallium/state_trackers')
| -rw-r--r-- | src/gallium/state_trackers/glx/xlib/Makefile | 3 |
1 files changed, 2 insertions, 1 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 \ |