1 files changed, 63 insertions, 31 deletions

diff --git a/build.zig b/build.zig
index 2e66934..264d541 100644
--- a/build.zig
+++ b/build.zig
@@ -19,39 +19,53 @@ pub fn build(b: *std.build.Builder) !void {
 
     const scan_protocols = ScanProtocolsStep.create(b);
 
-    const river = b.addExecutable("river", "src/river.zig");
-    river.setTarget(target);
-    river.setBuildMode(mode);
-    river.addBuildOption(bool, "xwayland", xwayland);
-    addServerDeps(river, &scan_protocols.step);
-    river.install();
-
-    const run_cmd = river.run();
-    run_cmd.step.dependOn(b.getInstallStep());
-
-    const run_step = b.step("run", "Run the compositor");
-    run_step.dependOn(&run_cmd.step);
-
-    const riverctl = b.addExecutable("riverctl", "src/riverctl.zig");
-    riverctl.setTarget(target);
-    riverctl.setBuildMode(mode);
-    riverctl.install();
-
-    const river_test = b.addTest("src/test_main.zig");
-    river_test.setTarget(target);
-    river_test.setBuildMode(mode);
-    river_test.addBuildOption(bool, "xwayland", xwayland);
-    addServerDeps(river_test, &scan_protocols.step);
-
-    const test_step = b.step("test", "Run the tests");
-    test_step.dependOn(&river_test.step);
-}
+    {
+        const river = b.addExecutable("river", "src/river.zig");
+        river.setTarget(target);
+        river.setBuildMode(mode);
+        river.addBuildOption(bool, "xwayland", xwayland);
 
-fn addServerDeps(exe: *std.build.LibExeObjStep, protocol_step: *std.build.Step) void {
-    exe.step.dependOn(protocol_step);
-    exe.addIncludeDir("protocol");
-    exe.addCSourceFile("protocol/river-window-management-unstable-v1-protocol.c", &[_][]const u8{"-std=c99"});
+        addProtocolDeps(river, &scan_protocols.step);
+        addServerDeps(river);
 
+        river.install();
+
+        const run_cmd = river.run();
+        run_cmd.step.dependOn(b.getInstallStep());
+
+        const run_step = b.step("run", "Run the compositor");
+        run_step.dependOn(&run_cmd.step);
+    }
+
+    {
+        const riverctl = b.addExecutable("riverctl", "src/riverctl.zig");
+        riverctl.setTarget(target);
+        riverctl.setBuildMode(mode);
+
+        addProtocolDeps(riverctl, &scan_protocols.step);
+
+        riverctl.linkLibC();
+
+        riverctl.linkSystemLibrary("wayland-client");
+
+        riverctl.install();
+    }
+
+    {
+        const river_test = b.addTest("src/test_main.zig");
+        river_test.setTarget(target);
+        river_test.setBuildMode(mode);
+        river_test.addBuildOption(bool, "xwayland", xwayland);
+
+        addProtocolDeps(river_test, &scan_protocols.step);
+        addServerDeps(river_test);
+
+        const test_step = b.step("test", "Run the tests");
+        test_step.dependOn(&river_test.step);
+    }
+}
+
+fn addServerDeps(exe: *std.build.LibExeObjStep) void {
     exe.addCSourceFile("include/bindings.c", &[_][]const u8{"-std=c99"});
     exe.addIncludeDir(".");
 
@@ -62,6 +76,12 @@ fn addServerDeps(exe: *std.build.LibExeObjStep, protocol_step: *std.build.Step)
     exe.linkSystemLibrary("xkbcommon");
 }
 
+fn addProtocolDeps(exe: *std.build.LibExeObjStep, protocol_step: *std.build.Step) void {
+    exe.step.dependOn(protocol_step);
+    exe.addIncludeDir("protocol");
+    exe.addCSourceFile("protocol/river-window-management-unstable-v1-protocol.c", &[_][]const u8{"-std=c99"});
+}
+
 const ScanProtocolsStep = struct {
     builder: *std.build.Builder,
     step: std.build.Step,
@@ -116,6 +136,18 @@ const ScanProtocolsStep = struct {
             _ = try self.builder.exec(
                 &[_][]const u8{ "wayland-scanner", "private-code", xml_in_path, code_out_path },
             );
+
+            // We need the client header as well for river-window-management
+            if (std.mem.eql(u8, basename_no_ext, "river-window-management-unstable-v1")) {
+                const client_header_out_path = try std.mem.concat(
+                    self.builder.allocator,
+                    u8,
+                    &[_][]const u8{ "protocol/", basename_no_ext, "-client-protocol.h" },
+                );
+                _ = try self.builder.exec(
+                    &[_][]const u8{ "wayland-scanner", "client-header", xml_in_path, client_header_out_path },
+                );
+            }
         }
     }
 };