Corrects building glx as gallium-xlib without any dri targets.
Fixes: 66c94b9313a697ce8f2b222f4ba353035e4b8726
("meson: build gallium winsys for dri, null, and wrapper")
---
src/gallium/auxiliary/pipe-loader/meson.build | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/gallium/auxiliary/pipe-loader/meson.build
b/src/gallium/auxiliary/pipe-loader/meson.build
index 32e8188c68b..277a68057b9 100644
--- a/src/gallium/auxiliary/pipe-loader/meson.build
+++ b/src/gallium/auxiliary/pipe-loader/meson.build
@@ -31,6 +31,9 @@ libpipe_loader_defines = []
if dep_libdrm.found()
files_pipe_loader += files('pipe_loader_drm.c')
endif
+if with_dri
+ libpipe_loader_defines += '-DHAVE_PIPE_LOADER_DRI'
+endif
if with_gallium_drisw_kms
libpipe_loader_defines += '-DHAVE_PIPE_LOADER_KMS'
endif
@@ -43,7 +46,7 @@ libpipe_loader_static = static_library(
inc_gallium_winsys,
],
c_args : [
- c_vis_args, '-DHAVE_PIPE_LOADER_DRI', '-DGALLIUM_STATIC_TARGETS=1',
+ c_vis_args,'-DGALLIUM_STATIC_TARGETS=1',
libpipe_loader_defines,
],
link_with : [libloader, libxmlconfig],
@@ -59,7 +62,7 @@ libpipe_loader_dynamic = static_library(
inc_gallium_winsys,
],
c_args : [
- c_vis_args, libpipe_loader_defines, '-DHAVE_PIPE_LOADER_DRI',
+ c_vis_args, libpipe_loader_defines,
'-DPIPE_SEARCH_DIR="@0@"'.format(
join_paths(get_option('prefix'), get_option('libdir'), 'gallium-pipe')
)
--
2.19.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
