Zander671/river
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eliminate some code duplication

Browse Source
This commit is contained in:
Isaac Freund 2020-04-12 13:54:03 +02:00
parent 57a811583c
commit f254217d2c
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
build.zig
View File

@ -16,18 +16,7 @@ pub fn build(b: *std.build.Builder) !void {
const exe = b.addExecutable("river", "src/main.zig"); const exe = b.addExecutable("river", "src/main.zig");
exe.setTarget(target); exe.setTarget(target);
exe.setBuildMode(mode); exe.setBuildMode(mode);
addDeps(exe, &scan_protocols.step);
exe.step.dependOn(&scan_protocols.step);
exe.addIncludeDir("protocol");
exe.addCSourceFile("include/render.c", &[_][]const u8{"-std=c99"});
exe.addIncludeDir(".");
exe.linkLibC();
exe.linkSystemLibrary("wayland-server");
exe.linkSystemLibrary("wlroots");
exe.linkSystemLibrary("xkbcommon");
exe.install(); exe.install();
const run_cmd = exe.run(); const run_cmd = exe.run();
@ -39,22 +28,25 @@ pub fn build(b: *std.build.Builder) !void {
const test_exe = b.addTest("src/test_main.zig"); const test_exe = b.addTest("src/test_main.zig");
test_exe.setTarget(target); test_exe.setTarget(target);
test_exe.setBuildMode(mode); test_exe.setBuildMode(mode);
addDeps(test_exe, &scan_protocols.step);
test_exe.step.dependOn(&scan_protocols.step);
test_exe.addIncludeDir("protocol");
test_exe.addCSourceFile("include/render.c", &[_][]const u8{"-std=c99"});
test_exe.addIncludeDir(".");
test_exe.linkLibC();
test_exe.linkSystemLibrary("wayland-server");
test_exe.linkSystemLibrary("wlroots");
test_exe.linkSystemLibrary("xkbcommon");
const test_step = b.step("test", "Run the tests"); const test_step = b.step("test", "Run the tests");
test_step.dependOn(&test_exe.step); test_step.dependOn(&test_exe.step);
} }
fn addDeps(exe: *std.build.LibExeObjStep, protocol_step: *std.build.Step) void {
exe.step.dependOn(protocol_step);
exe.addIncludeDir("protocol");
exe.addCSourceFile("include/render.c", &[_][]const u8{"-std=c99"});
exe.addIncludeDir(".");
exe.linkLibC();
exe.linkSystemLibrary("wayland-server");
exe.linkSystemLibrary("wlroots");
exe.linkSystemLibrary("xkbcommon");
}
const ScanProtocolsStep = struct { const ScanProtocolsStep = struct {
builder: *std.build.Builder, builder: *std.build.Builder,
step: std.build.Step, step: std.build.Step,