From 9073c9a6c73f3f2f48341367e255f7e4a0a644a9 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Fri, 13 Apr 2018 14:54:08 +0900 Subject: [PATCH] Use 'private-code' for wayland-scanner code generation Same as for wlroots - autodetect version and use either 'code' or the new one --- protocols/meson.build | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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') 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, output: '@BASENAME@-protocol.c', - arguments: ['code', '@INPUT@', '@OUTPUT@'], + arguments: [code_type, '@INPUT@', '@OUTPUT@'], ) wayland_scanner_client = generator(