mirror of
https://github.com/hyprwm/Hyprland
synced 2024-11-02 17:26:00 +01:00
64 lines
2.1 KiB
Diff
64 lines
2.1 KiB
Diff
diff --git a/meson.build b/meson.build
|
|
index f3802553..6a924a79 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -21,9 +21,9 @@ else
|
|
endif
|
|
|
|
GIT_BRANCH = run_command('git', 'rev-parse', '--abbrev-ref', 'HEAD', check: false).stdout().strip()
|
|
-GIT_COMMIT_HASH = run_command('git', 'rev-parse', 'HEAD', check: false).stdout().strip()
|
|
+GIT_COMMIT_HASH = '@GIT_COMMIT_HASH@'
|
|
GIT_COMMIT_MESSAGE = run_command('sh', '-c', 'git show | head -n 5 | tail -n 1', check: false).stdout().strip()
|
|
-GIT_DIRTY = run_command('sh', '-c', 'git diff-index --quiet HEAD -- || echo "dirty"', check: false).stdout().strip()
|
|
+GIT_DIRTY = '@GIT_DIRTY@'
|
|
|
|
add_project_arguments(
|
|
[
|
|
@@ -39,21 +39,8 @@ add_project_arguments(
|
|
],
|
|
language: 'cpp')
|
|
|
|
-wlroots = subproject('wlroots', default_options: ['examples=false'])
|
|
-have_xwlr = wlroots.get_variable('features').get('xwayland')
|
|
-xcb_dep = dependency('xcb', required: get_option('xwayland'))
|
|
-
|
|
-cmake = import('cmake')
|
|
-udis = cmake.subproject('udis86')
|
|
-udis86 = udis.dependency('libudis86')
|
|
-
|
|
-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')
|
|
+if get_option('xwayland').disabled()
|
|
+ add_project_arguments('-DNO_XWAYLAND', language: 'cpp')
|
|
endif
|
|
|
|
backtrace_dep = cpp_compiler.find_library('execinfo', required: false)
|
|
diff --git a/src/meson.build b/src/meson.build
|
|
index 7b658d31..60aa4057 100644
|
|
--- a/src/meson.build
|
|
+++ b/src/meson.build
|
|
@@ -7,16 +7,16 @@ executable('Hyprland', src,
|
|
server_protos,
|
|
dependency('wayland-server'),
|
|
dependency('wayland-client'),
|
|
- wlroots.get_variable('wlroots'),
|
|
+ dependency('wlroots'),
|
|
dependency('cairo'),
|
|
dependency('libdrm'),
|
|
dependency('egl'),
|
|
dependency('xkbcommon'),
|
|
dependency('libinput'),
|
|
- xcb_dep,
|
|
+ dependency('xcb', required: get_option('xwayland')),
|
|
backtrace_dep,
|
|
systemd_dep,
|
|
- udis86,
|
|
+ dependency('udis86'),
|
|
|
|
dependency('pixman-1'),
|
|
dependency('gl', 'opengl'),
|