diff options
| author | Brian Paul <brianp@vmware.com> | 2009-09-15 09:47:35 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-09-15 09:47:35 -0600 |
| commit | 41bbc8395111c6ef37e08a63ee58876d10a09e77 (patch) | |
| tree | ff42e8359e3894b99da66599f9dc8ef44d9d3307 /src/gallium/winsys | |
| parent | c0cf9dc05e2d887ce6419e6cae1b3606a1779b3f (diff) | |
| parent | 5d526ed21ac9f1ec9220c2adb4c905893eb9d990 (diff) | |
Merge branch 'mesa_7_6_branch'
Diffstat (limited to 'src/gallium/winsys')
| -rw-r--r-- | src/gallium/winsys/xlib/Makefile | 1 | ||||
| -rw-r--r-- | src/gallium/winsys/xlib/xlib_llvmpipe.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/winsys/xlib/Makefile b/src/gallium/winsys/xlib/Makefile index 522f6dc5ae..3a1945d92c 100644 --- a/src/gallium/winsys/xlib/Makefile +++ b/src/gallium/winsys/xlib/Makefile @@ -34,6 +34,7 @@ XLIB_WINSYS_SOURCES = \ xlib_brw_aub.c \ xlib_brw_context.c \ xlib_brw_screen.c \ + xlib_llvmpipe.c \ xlib_softpipe.c \ xlib_trace.c diff --git a/src/gallium/winsys/xlib/xlib_llvmpipe.c b/src/gallium/winsys/xlib/xlib_llvmpipe.c index bc876591c0..3dd15e099b 100644 --- a/src/gallium/winsys/xlib/xlib_llvmpipe.c +++ b/src/gallium/winsys/xlib/xlib_llvmpipe.c @@ -33,6 +33,8 @@ */ +#if defined(GALLIUM_LLVMPIPE) + #include "xm_api.h" #undef ASSERT @@ -459,3 +461,4 @@ struct xm_driver xlib_llvmpipe_driver = +#endif /* GALLIUM_LLVMPIPE */ |