diff options
| author | Scott Anderson <scott@anderso.nz> | 2018-08-24 19:35:02 +1200 |
|---|---|---|
| committer | Scott Anderson <scott@anderso.nz> | 2018-08-24 19:35:02 +1200 |
| commit | fd3fa760d336312acafeb6812b5b0068f5851f27 (patch) | |
| tree | 6876337b81c01c13d53d6c4f2e3680c51fd9e204 /rootston | |
| parent | 9c886f20b97b6ab1ac85b849f1fe7f16eb199ff0 (diff) | |
Revert "Revert "Merge pull request #1194 from ascent12/meson_feature""
This reverts commit 9c886f20b97b6ab1ac85b849f1fe7f16eb199ff0.
Diffstat (limited to 'rootston')
| -rw-r--r-- | rootston/meson.build | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/rootston/meson.build b/rootston/meson.build index 8ab872b5..9d1decce 100644 --- a/rootston/meson.build +++ b/rootston/meson.build @@ -11,12 +11,17 @@ sources = [ 'seat.c', 'virtual_keyboard.c', 'wl_shell.c', - 'xdg_shell_v6.c', 'xdg_shell.c', + 'xdg_shell_v6.c', ] -if get_option('enable-xwayland') - sources += ['xwayland.c'] + +if conf_data.get('WLR_HAS_XWAYLAND', false) + sources += 'xwayland.c' endif + executable( - 'rootston', sources, dependencies: [wlroots, wlr_protos, pixman] + 'rootston', + sources, + dependencies: [wlroots, wlr_protos, pixman], + build_by_default: get_option('rootston'), ) |