aboutsummaryrefslogtreecommitdiffstats
path: root/protocols
diff options
context:
space:
mode:
authorLibravatar Dominique Martinet <asmadeus@codewreck.org>2018-04-13 14:54:08 +0900
committerLibravatar Dominique Martinet <asmadeus@codewreck.org>2018-04-13 22:37:37 +0900
commit9073c9a6c73f3f2f48341367e255f7e4a0a644a9 (patch)
treed12f1a951037d37d17031249ae80ee52bf684ba9 /protocols
parentMerge pull request #1804 from martinetd/crashes (diff)
downloadsway-9073c9a6c73f3f2f48341367e255f7e4a0a644a9.tar.gz
sway-9073c9a6c73f3f2f48341367e255f7e4a0a644a9.tar.zst
sway-9073c9a6c73f3f2f48341367e255f7e4a0a644a9.zip
Use 'private-code' for wayland-scanner code generation
Same as for wlroots - autodetect version and use either 'code' or the new one
Diffstat (limited to 'protocols')
-rw-r--r--protocols/meson.build9
1 files changed, 8 insertions, 1 deletions
diff --git a/protocols/meson.build b/protocols/meson.build
index 7f83b16b..9d213f81 100644
--- a/protocols/meson.build
+++ b/protocols/meson.build
@@ -2,10 +2,17 @@ wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir')
2 2
3wayland_scanner = find_program('wayland-scanner') 3wayland_scanner = find_program('wayland-scanner')
4 4
5# should check wayland_scanner's version, but it is hard to get
6if wayland_server.version().version_compare('>=1.14.91')
7 code_type = 'private-code'
8else
9 code_type = 'code'
10endif
11
5wayland_scanner_code = generator( 12wayland_scanner_code = generator(
6 wayland_scanner, 13 wayland_scanner,
7 output: '@BASENAME@-protocol.c', 14 output: '@BASENAME@-protocol.c',
8 arguments: ['code', '@INPUT@', '@OUTPUT@'], 15 arguments: [code_type, '@INPUT@', '@OUTPUT@'],
9) 16)
10 17
11wayland_scanner_client = generator( 18wayland_scanner_client = generator(