[Mesa-dev] [PATCH 26/48] meson: fix pipe-loader compilation for windows

[Eric Engestrom]

On Monday, 2018-06-11 15:55:53 -0700, Dylan Baker wrote:
> ---
>  src/gallium/auxiliary/pipe-loader/meson.build | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/src/gallium/auxiliary/pipe-loader/meson.build b/src/gallium/auxiliary/pipe-loader/meson.build
> index 32e8188c68b..207e4b0fac4 100644
> --- a/src/gallium/auxiliary/pipe-loader/meson.build
> +++ b/src/gallium/auxiliary/pipe-loader/meson.build
> @@ -27,13 +27,18 @@ 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_gallium_drisw_kms
>    libpipe_loader_defines += '-DHAVE_PIPE_LOADER_KMS'
>  endif
> +if not (with_gallium_st_nine or with_gallium_opencl)
> +  libpipe_loader_defines += '-DROP_PIPE_LOADER_MISC=1'

missing `D` here, and the `=1` is not necessary:
  '-DDROP_PIPE_LOADER_MISC'

> +endif
>  
>  libpipe_loader_static = static_library(
>    'pipe_loader_static',
> @@ -46,7 +51,7 @@ libpipe_loader_static = static_library(
>      c_vis_args, '-DHAVE_PIPE_LOADER_DRI', '-DGALLIUM_STATIC_TARGETS=1',
>      libpipe_loader_defines,
>    ],
> -  link_with : [libloader, libxmlconfig],
> +  link_with : [libpipe_loader_links, libxmlconfig],
>    dependencies : [dep_libdrm],
>    build_by_default : false,
>  )
> @@ -64,7 +69,7 @@ libpipe_loader_dynamic = static_library(
>        join_paths(get_option('prefix'), get_option('libdir'), 'gallium-pipe')
>      )
>    ],
> -  link_with : [libloader, libxmlconfig],
> +  link_with : [libpipe_loader_links, libxmlconfig],
>    dependencies : [dep_libdrm],
>    build_by_default : false,
>  )
> -- 
> 2.17.1
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev