diff options
| author | Emil Velikov <[email protected]> | 2014-02-22 16:44:14 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-02-24 14:52:27 +0000 |
| commit | 3445e8bb921545f74e2b6a823d47fa29352e9262 (patch) | |
| tree | 4d53688fbb389a511157263b6fc13c53d71e680f /src/gallium/targets/opencl | |
| parent | 0e7c30233f10d834ee26b7d6d32b397625e11e10 (diff) | |
pipe-loader: wrap pipe_loader_sw_probe_xlib within HAVE_PIPE_LOADER_XLIB
The above function implies using the the xlib winsys, which
has additional library dependencies that should not be forced.
Make the software xlib pipe loader optional thus avoid all
the dependency hell. A user that wishes to use the particular
pipe-loader would need to set the following within configure.ac.
enable_gallium_xlib_loader=yes
v2:
- Wrap sw/xlib/xlib_sw_winsys.h to handle compilation on systems
lacking X11 headers. Spotted by Christian Prochaska.
Tested-by: Tom Stellard <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75356
Signed-off-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium/targets/opencl')
| -rw-r--r-- | src/gallium/targets/opencl/Makefile.am | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am index 8eec40586e3..e82889e0f46 100644 --- a/src/gallium/targets/opencl/Makefile.am +++ b/src/gallium/targets/opencl/Makefile.am @@ -28,6 +28,13 @@ lib@OPENCL_LIBNAME@_la_LIBADD = \ -lclangBasic \ $(LLVM_LIBS) +if NEED_PIPE_LOADER_XLIB +lib@OPENCL_LIBNAME@_la_LIBADD += \ + $(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \ + -lX11 -lXext -lXfixes \ + $(LIBDRM_LIBS) +endif + lib@OPENCL_LIBNAME@_la_SOURCES = # Force usage of a C++ linker |