diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 293d0773a..6e27a1cc8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 4c80a226f..81080c9c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ zig-* +.zig-cache \ No newline at end of file diff --git a/build.zig b/build.zig index 27b15e369..15a7ff295 100644 --- a/build.zig +++ b/build.zig @@ -12,12 +12,9 @@ pub fn build(b: *std.Build) void { .target = target, .optimize = optimize, }); - lib.addCSourceFile(.{ .file = .{ .path = "src/harfbuzz.cc" } }); + lib.addCSourceFile(.{ .file = b.path("src/harfbuzz.cc") }); lib.linkLibCpp(); - lib.installHeadersDirectoryOptions(.{ - .source_dir = .{ .path = "src" }, - .install_dir = .header, - .install_subdir = "harfbuzz", + lib.installHeadersDirectory(b.path("src"), "harfbuzz", .{ .exclude_extensions = &.{".cc"}, }); if (enable_freetype) { diff --git a/build.zig.zon b/build.zig.zon index c9d4d8bc7..70f4affa4 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -15,12 +15,12 @@ }, .dependencies = .{ .freetype = .{ - .url = "https://pkg.machengine.org/freetype/ad7313db50a6bd29121d587effb3b308e21a20fd.tar.gz", - .hash = "122016f743edf65f5c0569f7ad06509218688e101c66f2c094d5d9400326945bcb90", + .url = "https://pkg.machengine.org/freetype/e8c5b37f320db03acba410d993441815bc809606.tar.gz", + .hash = "1220babb7939707ca390b934657dfd3c8c3a6a78cc9442e4cbd43e3f9ffd49daec9e", }, .brotli = .{ - .url = "https://pkg.machengine.org/brotli/538f4c5b085bb53c84e39860305442abd0436be5.tar.gz", - .hash = "12202a0f156a1d5d25a97468de318a99451a77b930f584d4edeff152259a875a4a75", + .url = "https://pkg.machengine.org/brotli/4c10522a5fa3b4fd7f8beedc8af1e20309719da9.tar.gz", + .hash = "122059777e9e24227733f386b2929a78e15be9b748c99dba0d209744c910671b101c", .lazy = true, }, },