From 34afb46078e310ac997cc90ca8e8b503330d14f2 Mon Sep 17 00:00:00 2001 From: CJ van den Berg Date: Wed, 5 Mar 2025 11:02:18 +0100 Subject: [PATCH] build: get tracy dependency indirectly from thespian --- build.zig | 20 ++++++++++---------- build.zig.zon | 4 ---- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/build.zig b/build.zig index 1656e8a..2a364df 100644 --- a/build.zig +++ b/build.zig @@ -206,7 +206,16 @@ pub fn build_exe( .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, .optimize = optimize, }) else undefined; @@ -234,15 +243,6 @@ pub fn build_exe( }); 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(.{ .root_source_file = b.path("help.md"), }); diff --git a/build.zig.zon b/build.zig.zon index c4a9e08..ed19001 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -9,10 +9,6 @@ .url = "https://github.com/n0s4/flags/archive/b3905aa990719ff567f1c5a2f89e6dd3292d8533.tar.gz", .hash = "1220930a42f8da3fb7f723e3ad3f6dcc6db76327dd8d26274566423192d53e91b2bb", }, - .tracy = .{ - .url = "https://github.com/neurocyte/zig-tracy/archive/e04e31c64498149a324491b8534758e6af43a5c2.tar.gz", - .hash = "1220d0fb2bff7b453dbb39d1db3eb472b6680e2564f2b23b0e947671be47bbdd188f", - }, .dizzy = .{ .url = "https://github.com/neurocyte/dizzy/archive/455d18369cbb2a0458ba70be919cd378338d695e.tar.gz", .hash = "1220220dbc7fe91c1c54438193ca765cebbcb7d58f35cdcaee404a9d2245a42a4362",