neurocyte/cbor
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

build: update to latest zig master

Browse source
This commit is contained in:
CJ van den Berg 2024-06-04 16:36:35 +02:00
parent c220c79e97
commit f53644ac11
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
build.zig
View file

@ -42,8 +42,8 @@ pub fn build(b: *std.Build) void {
lib.defineCMacro("TRACY_ENABLE", null); lib.defineCMacro("TRACY_ENABLE", null);
lib.defineCMacro("TRACY_CALLSTACK", null); lib.defineCMacro("TRACY_CALLSTACK", null);
} }
lib.addIncludePath(.{ .path = "src" }); lib.addIncludePath(b.path("src"));
lib.addIncludePath(.{ .path = "include" }); lib.addIncludePath(b.path("include"));
lib.addCSourceFiles(.{ .files = &[_][]const u8{ lib.addCSourceFiles(.{ .files = &[_][]const u8{
"src/backtrace.cpp", "src/backtrace.cpp",
"src/c/context.cpp", "src/c/context.cpp",
@ -69,20 +69,20 @@ pub fn build(b: *std.Build) void {
b.installArtifact(lib); b.installArtifact(lib);
const cbor_mod = b.addModule("cbor", .{ const cbor_mod = b.addModule("cbor", .{
.root_source_file = .{ .path = "src/cbor.zig" }, .root_source_file = b.path("src/cbor.zig"),
}); });
const thespian_mod = b.addModule("thespian", .{ const thespian_mod = b.addModule("thespian", .{
.root_source_file = .{ .path = "src/thespian.zig" }, .root_source_file = b.path("src/thespian.zig"),
.imports = &.{ .imports = &.{
.{ .name = "cbor", .module = cbor_mod }, .{ .name = "cbor", .module = cbor_mod },
}, },
}); });
thespian_mod.addIncludePath(.{ .path = "include" }); thespian_mod.addIncludePath(b.path("include"));
thespian_mod.linkLibrary(lib); thespian_mod.linkLibrary(lib);
const tests = b.addTest(.{ const tests = b.addTest(.{
.root_source_file = .{ .path = "test/tests.zig" }, .root_source_file = b.path("test/tests.zig"),
.target = target, .target = target,
.optimize = optimize, .optimize = optimize,
}); });
@ -90,9 +90,9 @@ pub fn build(b: *std.Build) void {
tests.root_module.addImport("build_options", options_mod); tests.root_module.addImport("build_options", options_mod);
tests.root_module.addImport("cbor", cbor_mod); tests.root_module.addImport("cbor", cbor_mod);
tests.root_module.addImport("thespian", thespian_mod); tests.root_module.addImport("thespian", thespian_mod);
tests.addIncludePath(.{ .path = "test" }); tests.addIncludePath(b.path("test"));
tests.addIncludePath(.{ .path = "src" }); tests.addIncludePath(b.path("src"));
tests.addIncludePath(.{ .path = "include" }); tests.addIncludePath(b.path("include"));
tests.addCSourceFiles(.{ .files = &[_][]const u8{ tests.addCSourceFiles(.{ .files = &[_][]const u8{
"test/cbor_match.cpp", "test/cbor_match.cpp",
"test/debug.cpp", "test/debug.cpp",

8
build.zig.zon
View file

@ -4,12 +4,12 @@
.dependencies = .{ .dependencies = .{
.asio = .{ .asio = .{
.url = "https://github.com/neurocyte/asio/archive/cd95148112967de017653173c4cad6a9d0bf60b7.tar.gz", .url = "https://github.com/neurocyte/asio/archive/b9c9c23ef2e6f11b6123535ec33e5a23ed0c59da.tar.gz",
.hash = "12207e740e2924b615c030f9ae64f4257b89f741b1554a2494dbe349b32b815bfefd", .hash = "1220c85e0d9438ec518849c84e3ea66633a0e191e49c4ae4bbb3bc46626cd8dfad75",
}, },
.tracy = .{ .tracy = .{
.url = "https://github.com/neurocyte/zig-tracy/archive/303574aa9015b2c5e80e053234b3ec1d6227f0ed.tar.gz", .url = "https://github.com/neurocyte/zig-tracy/archive/58999b786089e5319dd0707f6afbfca04c6340e7.tar.gz",
.hash = "12209136682cc51f20f5a4ff2365ca1a13445688aadfc570c4684b828bf9e48d2011", .hash = "1220a2c8f8db1b5265458ac967ea1f7cc0a8ddcd1d774df3b73d86c4f529aadbfb94",
}, },
}, },
.paths = .{ .paths = .{