diff options
| author | Simon Ser <contact@emersion.fr> | 2021-12-07 16:11:29 +0100 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2021-12-07 16:11:29 +0100 |
| commit | ad28490cf496e0ddae991fc553f24e63efe72a34 (patch) | |
| tree | 54a9fbc2c04d5a1cda52744204a09155f40fb406 | |
| parent | c50c4fc5cc7fc4c1e8e7ecd5d21bb821d0f7cfb6 (diff) | |
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.
| -rw-r--r-- | backend/wayland/meson.build | 6 | ||||
| -rw-r--r-- | examples/meson.build | 1 | ||||
| -rw-r--r-- | meson.build | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/backend/wayland/meson.build b/backend/wayland/meson.build index ebe31529..103d3f9f 100644 --- a/backend/wayland/meson.build +++ b/backend/wayland/meson.build @@ -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( 'backend.c', 'output.c', diff --git a/examples/meson.build b/examples/meson.build index 1e428e81..3ec4dac4 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -1,6 +1,7 @@ threads = dependency('threads') wayland_egl = dependency('wayland-egl') wayland_cursor = dependency('wayland-cursor') +wayland_client = dependency('wayland-client') libpng = dependency('libpng', required: false, disabler: true) egl = dependency('egl', required: false, disabler: true) glesv2 = dependency('glesv2', required: false, disabler: true) diff --git a/meson.build b/meson.build index 2f296949..2e72e445 100644 --- a/meson.build +++ b/meson.build @@ -103,10 +103,6 @@ wayland_server = dependency('wayland-server', fallback: ['wayland', 'wayland_server_dep'], 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') gbm = dependency('gbm', version: '>=17.1.0') @@ -119,7 +115,6 @@ rt = cc.find_library('rt') wlr_files = [] wlr_deps = [ wayland_server, - wayland_client, drm, gbm, xkbcommon, |