From e3f5c3232cbfd724682d3df27d83587383969d86 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 17 May 2018 11:52:26 -0700 Subject: [PATCH] meson: fix pipe-loader compilation for windows v2: - Add missing D to pound define - Simply define the variable rather than set it to 1 (mirrors android.mk not scons) Acked-by: Kristian H. Kristensen --- src/gallium/auxiliary/pipe-loader/meson.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gallium/auxiliary/pipe-loader/meson.build b/src/gallium/auxiliary/pipe-loader/meson.build index 0e4b1ded5c5..d1888162a42 100644 --- a/src/gallium/auxiliary/pipe-loader/meson.build +++ b/src/gallium/auxiliary/pipe-loader/meson.build @@ -27,9 +27,11 @@ files_pipe_loader = files( ) libpipe_loader_defines = [] +libpipe_loader_links = [] if dep_libdrm.found() files_pipe_loader += files('pipe_loader_drm.c') + libpipe_loader_links += libloader endif if with_dri libpipe_loader_defines += '-DHAVE_PIPE_LOADER_DRI' @@ -37,6 +39,9 @@ endif if with_gallium_drisw_kms libpipe_loader_defines += '-DHAVE_PIPE_LOADER_KMS' endif +if not (with_gallium_st_nine or with_gallium_opencl) + libpipe_loader_defines += '-DDROP_PIPE_LOADER_MISC' +endif libpipe_loader_static = static_library( 'pipe_loader_static', @@ -64,7 +69,7 @@ libpipe_loader_dynamic = static_library( join_paths(get_option('prefix'), get_option('libdir'), 'gallium-pipe') ) ], - link_with : libloader, + link_with : [libpipe_loader_links], dependencies : [dep_libdrm, idep_xmlconfig], build_by_default : false, ) -- 2.30.2