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 /xwayland | |
| 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 'xwayland')
| -rw-r--r-- | xwayland/meson.build | 40 |
1 files changed, 7 insertions, 33 deletions
diff --git a/xwayland/meson.build b/xwayland/meson.build index 0bd88924..ec486f58 100644 --- a/xwayland/meson.build +++ b/xwayland/meson.build @@ -1,32 +1,3 @@ -xwayland_libs = [] -xwayland_required = [ - 'xcb', - 'xcb-composite', - 'xcb-render', - 'xcb-xfixes', -] -xwayland_optional = [ - 'xcb-errors', - 'xcb-icccm', -] - -foreach lib : xwayland_required - dep = dependency(lib, required: get_option('xwayland')) - if not dep.found() - subdir_done() - endif - - xwayland_libs += dep -endforeach - -foreach lib : xwayland_optional - dep = dependency(lib, required: get_option(lib)) - if dep.found() - xwayland_libs += dep - conf_data.set('WLR_HAS_' + lib.underscorify().to_upper(), true) - endif -endforeach - lib_wlr_xwayland = static_library( 'wlr_xwayland', files( @@ -41,11 +12,14 @@ lib_wlr_xwayland = static_library( include_directories: wlr_inc, dependencies: [ wayland_server, - xwayland_libs, + xcb, + xcb_composite, + xcb_xfixes, + xcb_image, + xcb_render, + xcb_icccm, + xcb_errors, xkbcommon, pixman, ], ) - -wlr_parts += lib_wlr_xwayland -conf_data.set('WLR_HAS_XWAYLAND', true) |