alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1810 from martinetd/wl_scanner

Browse source 
Use 'private-code' for wayland-scanner code generation
This commit is contained in:
emersion 2018-04-13 09:41:52 -04:00 committed by GitHub
parent 3dd185ec04 9073c9a6c7
commit 54ae394754
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
protocols/meson.build
View file

@ -2,10 +2,17 @@ wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir')
wayland_scanner = find_program('wayland-scanner') wayland_scanner = find_program('wayland-scanner')
# should check wayland_scanner's version, but it is hard to get
if wayland_server.version().version_compare('>=1.14.91')
code_type = 'private-code'
else
code_type = 'code'
endif
wayland_scanner_code = generator( wayland_scanner_code = generator(
wayland_scanner, wayland_scanner,
output: '@BASENAME@-protocol.c', output: '@BASENAME@-protocol.c',
arguments: ['code', '@INPUT@', '@OUTPUT@'], arguments: [code_type, '@INPUT@', '@OUTPUT@'],
) )
wayland_scanner_client = generator( wayland_scanner_client = generator(