[Mesa-dev] [PATCH v3 20/48] meson: build graw-gdi target

[Dylan Baker]

Quoting Eric Anholt (2018-08-07 11:14:16)
> Dylan Baker <dylan at pnwbakers.com> writes:
> 
> > ---
> >  src/gallium/meson.build                  |  4 ++-
> >  src/gallium/targets/graw-gdi/meson.build | 36 ++++++++++++++++++++++++
> >  2 files changed, 39 insertions(+), 1 deletion(-)
> >  create mode 100644 src/gallium/targets/graw-gdi/meson.build
> >
> > diff --git a/src/gallium/meson.build b/src/gallium/meson.build
> > index 5019477788b..e4e0b88e7fc 100644
> > --- a/src/gallium/meson.build
> > +++ b/src/gallium/meson.build
> > @@ -197,7 +197,9 @@ if with_platform_windows
> >  endif
> >  if with_tests
> >    subdir('targets/graw-null')
> > -  if with_glx == 'gallium-xlib'
> > +  if with_platform_windows
> > +    subdir('targets/graw-gdi')
> > +  elif with_glx == 'gallium-xlib'
> >      subdir('targets/graw-xlib')
> >    endif
> >    subdir('tests')
> > diff --git a/src/gallium/targets/graw-gdi/meson.build b/src/gallium/targets/graw-gdi/meson.build
> > new file mode 100644
> > index 00000000000..e04b454ab53
> > --- /dev/null
> > +++ b/src/gallium/targets/graw-gdi/meson.build
> > @@ -0,0 +1,36 @@
> > +# Copyright © 2018 Intel Corporation
> > +
> > +# Permission is hereby granted, free of charge, to any person obtaining a copy
> > +# of this software and associated documentation files (the "Software"), to deal
> > +# in the Software without restriction, including without limitation the rights
> > +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> > +# copies of the Software, and to permit persons to whom the Software is
> > +# furnished to do so, subject to the following conditions:
> > +
> > +# The above copyright notice and this permission notice shall be included in
> > +# all copies or substantial portions of the Software.
> > +
> > +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> > +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> > +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
> > +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> > +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> > +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
> > +# SOFTWARE.
> > +
> > +libgraw_gdi = shared_library(
> > +  'graw',
> > +  'graw_gdi.c',
> > +  include_directories : [
> > +    inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_gallium_drivers,
> > +    inc_gallium_winsys_sw,
> > +  ],
> > +  link_with : [
> > +    libgraw_util, libmesa_util, libgallium, libwsgdi,
> > +  ],
> > +  dependencies : [
> > +    dep_ws2_32, driver_swrast,
> > +  ],
> > +)
> 
> Looks like this is missing GALLIUM_SOFTPIPE/GALLIUM_LLVMPIPE
> definitions.

driver_swrast will have the correct defines depending on whether softpipe or
llvmpipe is being built.
-------------- 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/20180809/2a56ccf3/attachment.sig>