aboutsummaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary
diff options
context:
space:
mode:
authorDylan Baker <[email protected]>2017-12-08 15:26:00 -0800
committerDylan Baker <[email protected]>2018-01-08 16:39:42 -0800
commit42ea0631f108d82554339530d6c88aa1b448af1e (patch)
tree305e2e7dd00136b80dbaba42e0e1dd104349bd8f /src/gallium/auxiliary
parent425fcbde3f816e2a2efb8d1aed2442d40898d447 (diff)
meson: build clover
This has only been compile tested. v2: - Have a single option for opencl (Eric E) - fix typo "tgis" -> "tgsi" (Curro) - Don't add "lib" to pipe loader libraries, which matches the autotools behavior v3: - Remove trailing whitespace - Make PIPE_SEARCH_DIR an absolute path v4: - add trailing / to LIBCLC defines Acked-by: Curro Jerez <[email protected]> Tested-by: Jan Vesely <[email protected]> cc: Aaron Watry <[email protected]> Signed-off-by: Dylan Baker <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary')
-rw-r--r--src/gallium/auxiliary/pipe-loader/meson.build3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/pipe-loader/meson.build b/src/gallium/auxiliary/pipe-loader/meson.build
index 9b12432aea0..869a2935149 100644
--- a/src/gallium/auxiliary/pipe-loader/meson.build
+++ b/src/gallium/auxiliary/pipe-loader/meson.build
@@ -60,7 +60,8 @@ libpipe_loader_dynamic = static_library(
],
c_args : [
c_vis_args, libpipe_loader_defines, '-DHAVE_PIPE_LOADER_DRI',
- '-DPIPE_SEARCH_DIR="@0@"'.format(join_paths(get_option('libdir'), 'gallium-pipe')
+ '-DPIPE_SEARCH_DIR="@0@"'.format(
+ join_paths(get_option('prefix'), get_option('libdir'), 'gallium-pipe')
)
],
link_with : [libloader, libxmlconfig],