|
1 | 1 | const std = @import("std");
|
2 |
| -const zlib_build = @import("zlib/zlib.zig"); |
3 | 2 |
|
4 | 3 | pub fn build(b: *std.Build) void {
|
5 | 4 | const target = b.standardTargetOptions(.{});
|
6 | 5 | const optimize = b.standardOptimizeOption(.{});
|
7 | 6 |
|
8 |
| - const zlib = zlib_build.create(b, target, optimize); |
9 |
| - //b.installArtifact(zlib.step); |
| 7 | + // Define dependencies. |
| 8 | + const zlib = b.dependency("zlib", .{}); |
10 | 9 |
|
11 |
| - const zlib_module = b.addModule("zlib", .{ |
12 |
| - .source_file = .{ .path = "zlib/src/main.zig" }, |
13 |
| - }); |
| 10 | + // Define module |
14 | 11 | const ws_module = b.addModule("ws", .{
|
15 | 12 | .source_file = .{ .path = "src/main.zig" },
|
16 |
| - .dependencies = &[_]std.Build.ModuleDependency{.{ .name = "zlib", .module = zlib_module }}, |
| 13 | + .dependencies = &[_]std.Build.ModuleDependency{.{ .name = "zlib", .module = zlib.module("zlib") }}, |
17 | 14 | });
|
18 | 15 |
|
| 16 | + // Build library. |
19 | 17 | const ws_lib = b.addStaticLibrary(.{
|
20 | 18 | .name = "ws",
|
21 | 19 | .root_source_file = .{ .path = "src/main.zig" },
|
22 | 20 | .target = target,
|
23 | 21 | .optimize = optimize,
|
24 | 22 | });
|
25 |
| - zlib.link(ws_lib, .{ .import_name = "zlib" }); |
| 23 | + // Link z library and zlib module. |
| 24 | + ws_lib.linkLibrary(b.dependency("zlib", .{ |
| 25 | + .target = target, |
| 26 | + .optimize = optimize, |
| 27 | + }).artifact("z")); |
| 28 | + ws_lib.addModule("zlib", zlib.module("zlib")); |
26 | 29 | b.installArtifact(ws_lib);
|
27 | 30 |
|
28 |
| - // zig build test |
| 31 | + // Build test. |
29 | 32 | const test_compile = b.addTest(.{
|
30 | 33 | .root_source_file = .{ .path = "src/main.zig" },
|
31 | 34 | .target = target,
|
32 | 35 | .optimize = optimize,
|
33 | 36 | });
|
34 |
| - zlib.link(test_compile, .{ .import_name = "zlib" }); |
35 |
| - |
| 37 | + test_compile.linkLibrary(b.dependency("zlib", .{ |
| 38 | + .target = target, |
| 39 | + .optimize = optimize, |
| 40 | + }).artifact("z")); |
| 41 | + test_compile.addModule("zlib", zlib.module("zlib")); |
36 | 42 | const test_step = b.step("test", "Run unit tests");
|
37 | 43 | test_step.dependOn(&test_compile.step);
|
38 | 44 |
|
39 |
| - // build examples |
| 45 | + // Build examples. |
40 | 46 | const bin = b.addExecutable(.{
|
41 | 47 | .name = "autobahn_client",
|
42 | 48 | .root_source_file = .{ .path = "examples/autobahn_client.zig" },
|
|
0 commit comments