diff options
author | Michel Ganguin <michel@ganguin.net> | 2018-08-02 09:36:47 +0200 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2018-08-02 08:36:47 +0100 |
commit | d6095588a143710d25be47577ea65517770e7a74 (patch) | |
tree | 7347f317f47a67dcc1ae20716948a59cd35f2bb3 | |
parent | Merge pull request #2396 from RyanDwyer/fix-resize-wiggle (diff) | |
download | sway-d6095588a143710d25be47577ea65517770e7a74.tar.gz sway-d6095588a143710d25be47577ea65517770e7a74.tar.zst sway-d6095588a143710d25be47577ea65517770e7a74.zip |
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"
-rw-r--r-- | meson.build | 2 | ||||
-rw-r--r-- | sway/meson.build | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/meson.build b/meson.build index 05d334d2..0d75978f 100644 --- a/meson.build +++ b/meson.build | |||
@@ -44,13 +44,13 @@ systemd = dependency('libsystemd', required: false) | |||
44 | elogind = dependency('libelogind', required: false) | 44 | elogind = dependency('libelogind', required: false) |
45 | math = cc.find_library('m') | 45 | math = cc.find_library('m') |
46 | rt = cc.find_library('rt') | 46 | rt = cc.find_library('rt') |
47 | xcb = dependency('xcb') | ||
48 | git = find_program('git', required: false) | 47 | git = find_program('git', required: false) |
49 | 48 | ||
50 | conf_data = configuration_data() | 49 | conf_data = configuration_data() |
51 | 50 | ||
52 | if get_option('enable-xwayland') | 51 | if get_option('enable-xwayland') |
53 | conf_data.set('HAVE_XWAYLAND', true) | 52 | conf_data.set('HAVE_XWAYLAND', true) |
53 | xcb = dependency('xcb') | ||
54 | else | 54 | else |
55 | conf_data.set('HAVE_XWAYLAND', false) | 55 | conf_data.set('HAVE_XWAYLAND', false) |
56 | endif | 56 | endif |
diff --git a/sway/meson.build b/sway/meson.build index d92bb905..a9503c3b 100644 --- a/sway/meson.build +++ b/sway/meson.build | |||
@@ -153,10 +153,6 @@ sway_sources = files( | |||
153 | 'tree/output.c', | 153 | 'tree/output.c', |
154 | ) | 154 | ) |
155 | 155 | ||
156 | if get_option('enable-xwayland') | ||
157 | sway_sources += 'desktop/xwayland.c' | ||
158 | endif | ||
159 | |||
160 | sway_deps = [ | 156 | sway_deps = [ |
161 | cairo, | 157 | cairo, |
162 | gdk_pixbuf, | 158 | gdk_pixbuf, |
@@ -170,10 +166,14 @@ sway_deps = [ | |||
170 | server_protos, | 166 | server_protos, |
171 | wayland_server, | 167 | wayland_server, |
172 | wlroots, | 168 | wlroots, |
173 | xcb, | ||
174 | xkbcommon, | 169 | xkbcommon, |
175 | ] | 170 | ] |
176 | 171 | ||
172 | if get_option('enable-xwayland') | ||
173 | sway_sources += 'desktop/xwayland.c' | ||
174 | sway_deps += xcb | ||
175 | endif | ||
176 | |||
177 | executable( | 177 | executable( |
178 | 'sway', | 178 | 'sway', |
179 | sway_sources, | 179 | sway_sources, |