Merge branch 'master' into zig-0.14

This commit is contained in:
CJ van den Berg 2025-03-05 11:03:51 +01:00
commit 09832b1d3e
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
2 changed files with 10 additions and 14 deletions

View file

@ -206,7 +206,16 @@ pub fn build_exe(
.optimize = optimize, .optimize = optimize,
}); });
const tracy_dep = if (tracy_enabled) b.dependency("tracy", .{ const thespian_dep = b.dependency("thespian", .{
.target = target,
.optimize = optimize_deps,
.enable_tracy = tracy_enabled,
});
const thespian_mod = thespian_dep.module("thespian");
const cbor_mod = thespian_dep.module("cbor");
const tracy_dep = if (tracy_enabled) thespian_dep.builder.dependency("tracy", .{
.target = target, .target = target,
.optimize = optimize, .optimize = optimize,
}) else undefined; }) else undefined;
@ -234,15 +243,6 @@ pub fn build_exe(
}); });
const syntax_mod = syntax_dep.module("syntax"); const syntax_mod = syntax_dep.module("syntax");
const thespian_dep = b.dependency("thespian", .{
.target = target,
.optimize = optimize_deps,
.enable_tracy = tracy_enabled,
});
const thespian_mod = thespian_dep.module("thespian");
const cbor_mod = thespian_dep.module("cbor");
const help_mod = b.createModule(.{ const help_mod = b.createModule(.{
.root_source_file = b.path("help.md"), .root_source_file = b.path("help.md"),
}); });

View file

@ -10,10 +10,6 @@
.url = "https://github.com/n0s4/flags/archive/372501d1576b5723829bcba98e41361132c7b618.tar.gz", .url = "https://github.com/n0s4/flags/archive/372501d1576b5723829bcba98e41361132c7b618.tar.gz",
.hash = "1220ae181067a549c7a99cc0868193a7889b151381410419191ab1a79304f914336e", .hash = "1220ae181067a549c7a99cc0868193a7889b151381410419191ab1a79304f914336e",
}, },
.tracy = .{
.url = "https://github.com/neurocyte/zig-tracy/archive/e04e31c64498149a324491b8534758e6af43a5c2.tar.gz",
.hash = "1220d0fb2bff7b453dbb39d1db3eb472b6680e2564f2b23b0e947671be47bbdd188f",
},
.dizzy = .{ .dizzy = .{
.url = "https://github.com/neurocyte/dizzy/archive/455d18369cbb2a0458ba70be919cd378338d695e.tar.gz", .url = "https://github.com/neurocyte/dizzy/archive/455d18369cbb2a0458ba70be919cd378338d695e.tar.gz",
.hash = "1220220dbc7fe91c1c54438193ca765cebbcb7d58f35cdcaee404a9d2245a42a4362", .hash = "1220220dbc7fe91c1c54438193ca765cebbcb7d58f35cdcaee404a9d2245a42a4362",