mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Link xcb dependency to meson options "enable_xwayland" (#2393) 

* Link xcb dependency to meson options "enable_xwayland"

* Link xcb dependency to meson options "enable_xwayland"
This commit is contained in:
Michel Ganguin 2018-08-02 09:36:47 +02:00 committed by emersion
parent fe39129b96
commit d6095588a1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -44,13 +44,13 @@ systemd = dependency('libsystemd', required: false)
elogind = dependency('libelogind', required: false)
math = cc.find_library('m')
rt = cc.find_library('rt')
xcb = dependency('xcb')
git = find_program('git', required: false)
conf_data = configuration_data()
if get_option('enable-xwayland')
conf_data.set('HAVE_XWAYLAND', true)
xcb = dependency('xcb')
else
conf_data.set('HAVE_XWAYLAND', false)
endif

10
sway/meson.build
View File

@ -153,10 +153,6 @@ sway_sources = files(
'tree/output.c',
)
if get_option('enable-xwayland')
sway_sources += 'desktop/xwayland.c'
endif
sway_deps = [
cairo,
gdk_pixbuf,
@ -170,10 +166,14 @@ sway_deps = [
server_protos,
wayland_server,
wlroots,
xcb,
xkbcommon,
]
if get_option('enable-xwayland')
sway_sources += 'desktop/xwayland.c'
sway_deps += xcb
endif
executable(
'sway',
sway_sources,