diff options
author | emersion <contact@emersion.fr> | 2018-04-13 09:41:52 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-13 09:41:52 -0400 |
commit | 54ae394754533295627eacb8b26a579bc051dda9 (patch) | |
tree | d12f1a951037d37d17031249ae80ee52bf684ba9 /protocols | |
parent | Merge pull request #1804 from martinetd/crashes (diff) | |
parent | Use 'private-code' for wayland-scanner code generation (diff) | |
download | sway-54ae394754533295627eacb8b26a579bc051dda9.tar.gz sway-54ae394754533295627eacb8b26a579bc051dda9.tar.zst sway-54ae394754533295627eacb8b26a579bc051dda9.zip |
Merge pull request #1810 from martinetd/wl_scanner
Use 'private-code' for wayland-scanner code generation
Diffstat (limited to 'protocols')
-rw-r--r-- | protocols/meson.build | 9 |
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 | ||
3 | wayland_scanner = find_program('wayland-scanner') | 3 | wayland_scanner = find_program('wayland-scanner') |
4 | 4 | ||
5 | # should check wayland_scanner's version, but it is hard to get | ||
6 | if wayland_server.version().version_compare('>=1.14.91') | ||
7 | code_type = 'private-code' | ||
8 | else | ||
9 | code_type = 'code' | ||
10 | endif | ||
11 | |||
5 | wayland_scanner_code = generator( | 12 | wayland_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 | ||
11 | wayland_scanner_client = generator( | 18 | wayland_scanner_client = generator( |