blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #864 from martinetd/wl_scanner_code 

Use 'private-code' for wayland-scanner code generation
This commit is contained in:
Drew DeVault 2018-04-13 08:31:35 -04:00 committed by GitHub
parent 4dbf7f8b88 cd66d4732f
commit 7433d2f1de
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
protocol/meson.build
View File

@ -8,10 +8,17 @@ wayland_scanner_server = generator(
arguments: ['server-header', '@INPUT@', '@OUTPUT@'], arguments: ['server-header', '@INPUT@', '@OUTPUT@'],
) )
# 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(