diff --git a/meson.build b/meson.build index ea030c23..e09b78ae 100644 --- a/meson.build +++ b/meson.build @@ -2,6 +2,19 @@ project('Hyprland', 'cpp', 'c', version : '0.1', default_options : ['warning_level=3', 'cpp_std=c++20']) +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 Hyprland: 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 + subdir('protocols') subdir('src') subdir('hyprctl') 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: [