mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-29 05:40:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

20
backend/meson.build
View file

@ -1,4 +1,3 @@
backend_parts = []
backend_files = files(
'backend.c',
'drm/atomic.c',
@ -45,17 +44,28 @@ else
backend_files += files('session/direct.c')
endif
if logind.found()
if conf_data.get('WLR_HAS_SYSTEMD', false)
backend_files += files('session/logind.c')
backend_deps += logind
backend_deps += systemd
endif
subdir('x11')
if conf_data.get('WLR_HAS_X11_BACKEND', false)
backend_files += files(
'x11/backend.c',
'x11/input_device.c',
'x11/output.c',
)
backend_deps += xcb_xkb
endif
if conf_data.get('WLR_HAS_ELOGIND', false)
backend_files += files('session/logind.c')
backend_deps += elogind
endif
lib_wlr_backend = static_library(
'wlr_backend',
backend_files,
include_directories: wlr_inc,
link_whole: backend_parts,
dependencies: backend_deps,
)