summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFlorian "sp1rit"​ <sp1ritCS@protonmail.com>2022-06-14 11:19:03 +0200
committerFlorian "sp1rit"​ <sp1ritCS@protonmail.com>2022-06-16 23:30:30 +0200
commitc169f948951c63b56a4e39dd2ab921676f65f746 (patch)
tree9dc8e4a9d20271fe0593d208a092cb08bdce91a7 /src
parentb3ef1fcc545250b66ae356c4d26e47cbab230b11 (diff)
moved wlroots/xwayland definitions to the main meson file
prevents build-failure when xwayland is disabled to to add_project_arguments('-DNO_XWAYLAND', language: 'cpp') beeing called after the required wayland protocols have been built.
Diffstat (limited to 'src')
-rw-r--r--src/meson.build13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/meson.build b/src/meson.build
index 87aadbd7..4e52d65e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,19 +1,6 @@
globber = run_command('find', '-name', '*.cpp', check: true)
src = globber.stdout().strip().split('\n')
-wlroots = subproject('wlroots', default_options: ['examples=false'])
-have_xwlr = wlroots.get_variable('features').get('xwayland')
-xcb_dep = dependency('xcb', required: get_option('xwayland'))
-
-if get_option('xwayland').enabled() and not have_xwlr
- error('Cannot enable Xwayland in Hyperland: wlroots has been built without Xwayland support')
-endif
-have_xwayland = xcb_dep.found() and have_xwlr
-
-if not have_xwayland
-add_project_arguments('-DNO_XWAYLAND', language: 'cpp')
-endif
-
executable('Hyprland', src,
cpp_args: ['-DWLR_USE_UNSTABLE'],
dependencies: [