Skip to content

Commit 4a73aa0

Browse files
agagniereTechatrix
authored andcommitted
Methods relative to compilation are applied to the module
The following methods now apply to the module instead of the compile step: - addCSourceFiles - addIncludePath - linkLibrary
1 parent 01327d4 commit 4a73aa0

3 files changed

Lines changed: 15 additions & 14 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,20 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
zig-version: [master]
17+
zig-version: ["0.15.2"]
1818
os: [ubuntu-latest, macos-latest, windows-latest]
1919
include:
20-
- zig-version: "0.14.0"
20+
- zig-version: "0.14.1"
21+
os: ubuntu-latest
22+
- zig-version: "master"
2123
os: ubuntu-latest
2224
runs-on: ${{ matrix.os }}
2325
steps:
2426
- name: Checkout
25-
uses: actions/checkout@v4
27+
uses: actions/checkout@v6
2628

2729
- name: Setup Zig
28-
uses: mlugg/setup-zig@v1
30+
uses: mlugg/setup-zig@v2
2931
with:
3032
version: ${{ matrix.zig-version }}
3133

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
.zig-cache
2-
zig-cache
3-
zig-out
2+
zig-out

build.zig

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ pub fn build(b: *std.Build) void {
4848
zstd.installHeader(upstream.path("lib/zstd.h"), "zstd.h");
4949
zstd.installHeader(upstream.path("lib/zdict.h"), "zdict.h");
5050
zstd.installHeader(upstream.path("lib/zstd_errors.h"), "zstd_errors.h");
51-
if (compression) zstd.addCSourceFiles(.{ .root = upstream.path("lib"), .files = compression_sources });
52-
if (decompression) zstd.addCSourceFiles(.{ .root = upstream.path("lib"), .files = decompress_sources });
53-
if (dictbuilder) zstd.addCSourceFiles(.{ .root = upstream.path("lib"), .files = dict_builder_sources });
54-
if (deprecated) zstd.addCSourceFiles(.{ .root = upstream.path("lib"), .files = deprecated_sources });
51+
if (compression) zstd.root_module.addCSourceFiles(.{ .root = upstream.path("lib"), .files = compression_sources });
52+
if (decompression) zstd.root_module.addCSourceFiles(.{ .root = upstream.path("lib"), .files = decompress_sources });
53+
if (dictbuilder) zstd.root_module.addCSourceFiles(.{ .root = upstream.path("lib"), .files = dict_builder_sources });
54+
if (deprecated) zstd.root_module.addCSourceFiles(.{ .root = upstream.path("lib"), .files = deprecated_sources });
5555
if (legacy_support != 0) {
56-
for (legacy_support..8) |i| zstd.addCSourceFile(.{ .file = upstream.path(b.fmt("lib/legacy/zstd_v0{d}.c", .{i})) });
56+
for (legacy_support..8) |i| zstd.root_module.addCSourceFile(.{ .file = upstream.path(b.fmt("lib/legacy/zstd_v0{d}.c", .{i})) });
5757
}
5858

5959
if (target.result.cpu.arch == .x86_64) {
@@ -110,9 +110,9 @@ pub fn build(b: *std.Build) void {
110110
.optimize = optimize,
111111
}),
112112
});
113-
exe.addCSourceFile(.{ .file = upstream.path(b.fmt("examples/{s}.c", .{name})) });
114-
exe.addIncludePath(upstream.path("examples/common.c"));
115-
exe.linkLibrary(zstd);
113+
exe.root_module.addCSourceFile(.{ .file = upstream.path(b.fmt("examples/{s}.c", .{name})) });
114+
exe.root_module.addIncludePath(upstream.path("examples/common.c"));
115+
exe.root_module.linkLibrary(zstd);
116116
b.getInstallStep().dependOn(&b.addInstallArtifact(exe, .{ .dest_dir = .{ .override = .{ .custom = "examples" } } }).step);
117117
}
118118
}

0 commit comments

Comments
 (0)