summaryrefslogtreecommitdiffstats
path: root/src/gallium/tests
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2014-02-22 16:44:14 +0000
committerEmil Velikov <emil.l.velikov@gmail.com>2014-02-24 14:52:27 +0000
commit3445e8bb921545f74e2b6a823d47fa29352e9262 (patch)
tree4d53688fbb389a511157263b6fc13c53d71e680f /src/gallium/tests
parent0e7c30233f10d834ee26b7d6d32b397625e11e10 (diff)
downloadexternal_mesa3d-3445e8bb921545f74e2b6a823d47fa29352e9262.zip
external_mesa3d-3445e8bb921545f74e2b6a823d47fa29352e9262.tar.gz
external_mesa3d-3445e8bb921545f74e2b6a823d47fa29352e9262.tar.bz2
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 <thomas.stellard@amd.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75356 Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Diffstat (limited to 'src/gallium/tests')
-rw-r--r--src/gallium/tests/trivial/Makefile.am7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gallium/tests/trivial/Makefile.am b/src/gallium/tests/trivial/Makefile.am
index 656ee64..15a81b3 100644
--- a/src/gallium/tests/trivial/Makefile.am
+++ b/src/gallium/tests/trivial/Makefile.am
@@ -20,6 +20,13 @@ LDADD = $(GALLIUM_PIPE_LOADER_CLIENT_LIBS) \
$(PTHREAD_LIBS) \
-lm
+if NEED_PIPE_LOADER_XLIB
+LDADD += \
+ $(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \
+ -lX11 -lXext -lXfixes \
+ $(LIBDRM_LIBS)
+endif
+
noinst_PROGRAMS = compute tri quad-tex
compute_SOURCES = compute.c