[PATCH xserver 4/9] meson: Build libglx.so

[Eric Anholt]

Adam Jackson <ajax at redhat.com> writes:

> Signed-off-by: Adam Jackson <ajax at redhat.com>
> ---
>  glx/meson.build                |  5 +++++
>  hw/xfree86/dixmods/meson.build | 15 +++++++++++++++
>  meson.build                    |  2 ++
>  3 files changed, 22 insertions(+)
>
> diff --git a/glx/meson.build b/glx/meson.build
> index a29e53cfa..c5f5ecc8f 100644
> --- a/glx/meson.build
> +++ b/glx/meson.build
> @@ -48,3 +48,8 @@ if build_glx
>          ]
>      )
>  endif
> +
> +srcs_glxdri2 = ''
> +if build_dri2 or build_dri3
> +    srcs_glxdri2 = files('glxdri2.c')
> +endif
> diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
> index 2b8fe1349..e2c91265d 100644
> --- a/hw/xfree86/dixmods/meson.build
> +++ b/hw/xfree86/dixmods/meson.build
> @@ -36,3 +36,18 @@ shared_module(
>      install: true,
>      install_dir: module_dir,
>  )
> +
> +if build_glx
> +    shared_module(
> +        'glx',
> +        [ 'glxmodule.c', srcs_glxdri2 ],
> +
> +        include_directories: [ inc, xorg_inc, glx_inc ],
> +        c_args: [ xorg_c_args, glx_align64 ],
> +        dependencies: [ common_dep, dl_dep ],
> +        objects: libxserver_glx.extract_all_objects(),

Oops, I should have converted the other dixmods to .link_whole.  We can
either use that here now, or I'll send a fixup later.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 832 bytes
Desc: not available
URL: <https://lists.x.org/archives/xorg-devel/attachments/20170427/491541a4/attachment.sig>