blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: move wayland-client dep to backend/wayland/ 

wayland-client isn't really used by wlroots core, so let's move the
dep to where it's needed in the Wayland backend.
This commit is contained in:
Simon Ser 2021-12-07 16:11:29 +01:00
parent c50c4fc5cc
commit ad28490cf4
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/wayland/meson.build
View File

@ -1,3 +1,9 @@
wayland_client = dependency('wayland-client',
fallback: ['wayland', 'wayland_client_dep'],
default_options: wayland_project_options,
)
wlr_deps += wayland_client
wlr_files += files( wlr_files += files(
'backend.c', 'backend.c',
'output.c', 'output.c',

1
examples/meson.build
View File

@ -1,6 +1,7 @@
threads = dependency('threads') threads = dependency('threads')
wayland_egl = dependency('wayland-egl') wayland_egl = dependency('wayland-egl')
wayland_cursor = dependency('wayland-cursor') wayland_cursor = dependency('wayland-cursor')
wayland_client = dependency('wayland-client')
libpng = dependency('libpng', required: false, disabler: true) libpng = dependency('libpng', required: false, disabler: true)
egl = dependency('egl', required: false, disabler: true) egl = dependency('egl', required: false, disabler: true)
glesv2 = dependency('glesv2', required: false, disabler: true) glesv2 = dependency('glesv2', required: false, disabler: true)

5
meson.build
View File

@ -103,10 +103,6 @@ wayland_server = dependency('wayland-server',
fallback: ['wayland', 'wayland_server_dep'], fallback: ['wayland', 'wayland_server_dep'],
default_options: wayland_project_options, default_options: wayland_project_options,
) )
wayland_client = dependency('wayland-client',
fallback: ['wayland', 'wayland_client_dep'],
default_options: wayland_project_options,
)
drm = dependency('libdrm', version: '>=2.4.105') drm = dependency('libdrm', version: '>=2.4.105')
gbm = dependency('gbm', version: '>=17.1.0') gbm = dependency('gbm', version: '>=17.1.0')
@ -119,7 +115,6 @@ rt = cc.find_library('rt')
wlr_files = [] wlr_files = []
wlr_deps = [ wlr_deps = [
wayland_server, wayland_server,
wayland_client,
drm, drm,
gbm, gbm,
xkbcommon, xkbcommon,