aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominique Martinet <asmadeus@codewreck.org>2018-04-05 13:58:15 +0900
committerDominique Martinet <asmadeus@codewreck.org>2018-04-13 14:40:19 +0900
commitcd66d4732f60ba830f62095d1b4ed0c9e177503e (patch)
tree07287a2db6f04e84c179aa2dd115bfb50f5049f2
parent99b92b4104bf7bdd7663289c71f6cf0933e16a0f (diff)
Use 'private-code' for wayland-scanner code generation
They deprecated 'code' for 'public-code', but suggest using 'private-code'...
-rw-r--r--protocol/meson.build9
1 files changed, 8 insertions, 1 deletions
diff --git a/protocol/meson.build b/protocol/meson.build
index bdbde96a..4730baf7 100644
--- a/protocol/meson.build
+++ b/protocol/meson.build
@@ -8,10 +8,17 @@ wayland_scanner_server = generator(
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,
output: '@BASENAME@-protocol.c',
- arguments: ['code', '@INPUT@', '@OUTPUT@'],
+ arguments: [code_type, '@INPUT@', '@OUTPUT@'],
)
wayland_scanner_client = generator(