From 46d2f1f08d8919155ae6455ae2c3a17b262a63f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= Date: Sun, 15 Apr 2018 03:16:36 +0300 Subject: build: fixup vendored wayland protocols with variants Utilize the SRC variable for this to get a built-in relative path. Can be tested by adding `--variant="random_string"` to configure and build. --- wscript_build.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'wscript_build.py') diff --git a/wscript_build.py b/wscript_build.py index efccc97af6..cd2c9d099f 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -129,12 +129,14 @@ def build(ctx): ctx.wayland_protocol_header(proto_dir = ctx.env.WL_PROTO_DIR, protocol = "unstable/idle-inhibit/idle-inhibit-unstable-v1", target = "video/out/wayland/idle-inhibit-v1.h") - ctx.wayland_protocol_code(proto_dir = "../video/out/wayland", - protocol = "server-decoration", - target = "video/out/wayland/srv-decor.c") - ctx.wayland_protocol_header(proto_dir = "../video/out/wayland", - protocol = "server-decoration", - target = "video/out/wayland/srv-decor.h") + ctx.wayland_protocol_code(proto_dir = "video/out/wayland", + protocol = "server-decoration", + vendored_protocol = True, + target = "video/out/wayland/srv-decor.c") + ctx.wayland_protocol_header(proto_dir = "video/out/wayland", + protocol = "server-decoration", + vendored_protocol = True, + target = "video/out/wayland/srv-decor.h") ctx(features = "ebml_header", target = "ebml_types.h") ctx(features = "ebml_definitions", target = "ebml_defs.c") -- cgit v1.2.3