Revert "Merge pull request #1194 from ascent12/meson_feature"

This breaks wlroots when used as a meson subproject.

This reverts commit dea311992e, reversing
changes made to 6db9c4b746.
This commit is contained in:
Drew DeVault 2018-08-23 21:00:58 -04:00
parent dea311992e
commit 9c886f20b9
19 changed files with 227 additions and 385 deletions

View file

@ -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]
)