From c169f948951c63b56a4e39dd2ab921676f65f746 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20=22sp1rit=22=E2=80=8B?= Date: Tue, 14 Jun 2022 11:19:03 +0200 Subject: 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. --- src/meson.build | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'src') 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: [ -- cgit v1.2.3