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

[Dylan Baker]

Quoting Eric Engestrom (2018-06-12 03:39:17)
> 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'
> 

Scons sets it to 1, but android.mk doesn't. But since it's not required and
we generally don't set it in meson I'll do that.

Dylan
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20180612/258bf8a6/attachment.sig>