From 16ad3e32101d54d3be4c89e2740d3fd24bbdeee8 Mon Sep 17 00:00:00 2001 From: "Wrench[bot]" Date: Sat, 1 Jun 2024 17:26:16 -0700 Subject: [PATCH 1/2] all: update Zig to version 0.13.0-dev.351+64ef45eb0 Signed-off-by: Wrench[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 405bfb71..ac6e2bb4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: - name: Setup Zig run: | brew install xz - sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-macos-x86_64-0.12.0-dev.3180+83e578a18.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' + sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-macos-x86_64-0.13.0-dev.351+64ef45eb0.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: build run: zig build env: From 7054826b763329b03540ecdb1fdcfade29b6a317 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Sun, 2 Jun 2024 11:52:51 -0700 Subject: [PATCH 2/2] update to Zig 2024.05 Signed-off-by: Stephen Gutekanst --- .gitignore | 1 + build.zig | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2a891f26..1e7f0ebc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ # Zig stuff zig-* +.zig-cache diff --git a/build.zig b/build.zig index 82a16125..2ba4c68a 100644 --- a/build.zig +++ b/build.zig @@ -12,14 +12,14 @@ pub fn build(b: *std.Build) void { }); addPaths(&lib.root_module); // just for testing lib.linkLibC(); - lib.installHeadersDirectory("include", "."); + lib.installHeadersDirectory(b.path("include"), ".", .{}); b.installArtifact(lib); } pub fn addPaths(mod: *std.Build.Module) void { - mod.addSystemFrameworkPath(.{ .path = sdkPath("/Frameworks") }); - mod.addSystemIncludePath(.{ .path = sdkPath("/include") }); - mod.addLibraryPath(.{ .path = sdkPath("/lib") }); + mod.addSystemFrameworkPath(.{ .cwd_relative = sdkPath("/Frameworks") }); + mod.addSystemIncludePath(.{ .cwd_relative = sdkPath("/include") }); + mod.addLibraryPath(.{ .cwd_relative = sdkPath("/lib") }); } fn sdkPath(comptime suffix: []const u8) []const u8 {