From 66c94b9313a697ce8f2b222f4ba353035e4b8726 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Sat, 30 Sep 2017 13:48:34 -0700 Subject: meson: build gallium winsys for dri, null, and wrapper Signed-off-by: Dylan Baker Reviewed-by: Eric Anholt --- src/gallium/auxiliary/pipe-loader/meson.build | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/gallium/auxiliary') diff --git a/src/gallium/auxiliary/pipe-loader/meson.build b/src/gallium/auxiliary/pipe-loader/meson.build index c84fc9ddce8..9b12432aea0 100644 --- a/src/gallium/auxiliary/pipe-loader/meson.build +++ b/src/gallium/auxiliary/pipe-loader/meson.build @@ -26,9 +26,14 @@ files_pipe_loader = files( 'driinfo_gallium.h', ) +libpipe_loader_defines = [] + if dep_libdrm.found() files_pipe_loader += files('pipe_loader_drm.c') endif +if with_gallium_drisw_kms + libpipe_loader_defines += '-DHAVE_PIPE_LOADER_KMS' +endif libpipe_loader_static = static_library( 'pipe_loader_static', @@ -38,7 +43,8 @@ libpipe_loader_static = static_library( inc_gallium_winsys, ], c_args : [ - c_vis_args, '-DHAVE_PIPE_LOADER_DRI', '-DGALLIUM_STATIC_TARGETS=1' + c_vis_args, '-DHAVE_PIPE_LOADER_DRI', '-DGALLIUM_STATIC_TARGETS=1', + libpipe_loader_defines, ], link_with : [libloader, libxmlconfig], dependencies : [dep_libdrm], @@ -53,8 +59,8 @@ libpipe_loader_dynamic = static_library( inc_gallium_winsys, ], c_args : [ - c_vis_args, '-DHAVE_PIPE_LOADER_DRI', '-DPIPE_SEARCH_DIR="@0@"'.format( - join_paths(get_option('libdir'), 'gallium-pipe') + c_vis_args, libpipe_loader_defines, '-DHAVE_PIPE_LOADER_DRI', + '-DPIPE_SEARCH_DIR="@0@"'.format(join_paths(get_option('libdir'), 'gallium-pipe') ) ], link_with : [libloader, libxmlconfig], -- cgit v1.2.3