diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-08-23 21:00:58 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2018-08-23 21:00:58 -0400 |
commit | 9c886f20b97b6ab1ac85b849f1fe7f16eb199ff0 (patch) | |
tree | 7376c651ff0c75daf64bbc086858239a1d51f50b /rootston | |
parent | dea311992eb4ff3e343c3cf5b0603034223d2a42 (diff) |
Revert "Merge pull request #1194 from ascent12/meson_feature"
This breaks wlroots when used as a meson subproject.
This reverts commit dea311992eb4ff3e343c3cf5b0603034223d2a42, reversing
changes made to 6db9c4b74667c1d917d720f5e96985a2461569fb.
Diffstat (limited to 'rootston')
-rw-r--r-- | rootston/meson.build | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/rootston/meson.build b/rootston/meson.build index 9d1decce..8ab872b5 100644 --- a/rootston/meson.build +++ b/rootston/meson.build @@ -11,17 +11,12 @@ sources = [ 'seat.c', 'virtual_keyboard.c', 'wl_shell.c', - 'xdg_shell.c', 'xdg_shell_v6.c', + 'xdg_shell.c', ] - -if conf_data.get('WLR_HAS_XWAYLAND', false) - sources += 'xwayland.c' +if get_option('enable-xwayland') + sources += ['xwayland.c'] endif - executable( - 'rootston', - sources, - dependencies: [wlroots, wlr_protos, pixman], - build_by_default: get_option('rootston'), + 'rootston', sources, dependencies: [wlroots, wlr_protos, pixman] ) |