diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 72d70bfa..434d0d4f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -13,7 +13,7 @@ jobs: - name: Setup Zig run: | sudo apt install xz-utils - sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-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-linux-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 x86_64-windows: @@ -26,10 +26,10 @@ jobs: - name: Setup Zig run: | $ProgressPreference = 'SilentlyContinue' - Invoke-WebRequest -Uri "https://pkg.machengine.org/zig/zig-windows-x86_64-0.12.0-dev.3180+83e578a18.zip" -OutFile "C:\zig.zip" + Invoke-WebRequest -Uri "https://pkg.machengine.org/zig/zig-windows-x86_64-0.13.0-dev.351+64ef45eb0.zip" -OutFile "C:\zig.zip" cd C:\ 7z x zig.zip - Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.12.0-dev.3180+83e578a18\" + Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.13.0-dev.351+64ef45eb0\" - name: build run: zig build x86_64-macos: @@ -42,7 +42,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: diff --git a/.gitignore b/.gitignore index ee7098f1..dca1103a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ zig-out/ -zig-cache/ +.zig-cache/ diff --git a/build.zig b/build.zig index 2d66efd1..bf6c71e3 100644 --- a/build.zig +++ b/build.zig @@ -15,12 +15,9 @@ pub fn build(b: *std.Build) void { "-DSPIRV_CROSS_C_API_HLSL", "-DSPIRV_CROSS_C_API_MSL", } }); - lib.addIncludePath(.{ .path = "." }); - lib.installHeadersDirectoryOptions(.{ - .source_dir = .{ .path = "" }, + lib.addIncludePath(b.path(".")); + lib.installHeadersDirectory(b.path(""), "spirv-cross", .{ .include_extensions = &.{".h"}, - .install_dir = .header, - .install_subdir = "spirv-cross", }); b.installArtifact(lib); }