From d649b3f6d425e37ce521b7bec8c212d13c114f81 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 2 Aug 2023 14:39:19 -0700 Subject: [PATCH] update zig --- build.zig | 18 ++++++++--------- flake.lock | 6 +++--- pkg/freetype/build.zig | 36 +++++++++++++++++++++++----------- pkg/harfbuzz/build.zig | 6 +++--- pkg/libpng/build.zig | 8 ++++---- pkg/macos/build.zig | 10 ++++++++-- pkg/pixman/build.zig | 8 ++++---- pkg/stb_image_resize/build.zig | 9 ++++++--- pkg/tracy/build.zig | 15 ++++++++------ pkg/utf8proc/build.zig | 4 ++-- pkg/zlib/build.zig | 4 ++-- 11 files changed, 75 insertions(+), 49 deletions(-) diff --git a/build.zig b/build.zig index 9e1f05f68..905e87e15 100644 --- a/build.zig +++ b/build.zig @@ -684,11 +684,11 @@ fn addDeps( // stb_image_resize const stb_image_resize_step = try stb_image_resize.link(b, step, .{}); - try static_libs.append(.{ .generated = &stb_image_resize_step.output_path_source }); + try static_libs.append(stb_image_resize_step.getEmittedBin()); // utf8proc const utf8proc_step = try utf8proc.link(b, step); - try static_libs.append(.{ .generated = &utf8proc_step.output_path_source }); + try static_libs.append(utf8proc_step.getEmittedBin()); // Imgui, we have to do this later since we need some information const imgui_backends = if (step.target.isDarwin()) @@ -702,7 +702,7 @@ fn addDeps( // Dynamic link if (!static) { - step.addIncludePath(freetype.include_path_self); + step.addIncludePath(.{ .path = freetype.include_path_self }); step.linkSystemLibrary("bzip2"); step.linkSystemLibrary("freetype2"); step.linkSystemLibrary("harfbuzz"); @@ -716,7 +716,7 @@ fn addDeps( // Other dependencies, we may dynamically link if (static) { const zlib_step = try zlib.link(b, step); - try static_libs.append(.{ .generated = &zlib_step.output_path_source }); + try static_libs.append(zlib_step.getEmittedBin()); const libpng_step = try libpng.link(b, step, .{ .zlib = .{ @@ -724,7 +724,7 @@ fn addDeps( .include = &zlib.include_paths, }, }); - try static_libs.append(.{ .generated = &libpng_step.output_path_source }); + try static_libs.append(libpng_step.getEmittedBin()); // Freetype const freetype_step = try freetype.link(b, step, .{ @@ -740,7 +740,7 @@ fn addDeps( .include = &zlib.include_paths, }, }); - try static_libs.append(.{ .generated = &freetype_step.output_path_source }); + try static_libs.append(freetype_step.getEmittedBin()); // Harfbuzz const harfbuzz_step = try harfbuzz.link(b, step, .{ @@ -755,11 +755,11 @@ fn addDeps( }, }); system_sdk.include(b, harfbuzz_step, .{}); - try static_libs.append(.{ .generated = &harfbuzz_step.output_path_source }); + try static_libs.append(harfbuzz_step.getEmittedBin()); // Pixman const pixman_step = try pixman.link(b, step, .{}); - try static_libs.append(.{ .generated = &pixman_step.output_path_source }); + try static_libs.append(pixman_step.getEmittedBin()); // Only Linux gets fontconfig if (font_backend.hasFontconfig()) { @@ -874,8 +874,8 @@ fn benchSteps( .root_source_file = .{ .path = path }, .target = target, .optimize = optimize, + .main_pkg_path = .{ .path = "./src" }, }); - c_exe.setMainPkgPath("./src"); if (install) b.installArtifact(c_exe); _ = try addDeps(b, c_exe, true); } diff --git a/flake.lock b/flake.lock index 8da3fe934..3c2350a0f 100644 --- a/flake.lock +++ b/flake.lock @@ -126,11 +126,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1690503794, - "narHash": "sha256-KeJI6b2CxOFeCzp8wWJCdct5XSgUKpsDap0rkWttVXc=", + "lastModified": 1690978078, + "narHash": "sha256-+S9s6sjOGuGCtA9njTdduJ7KjZm2tskxKhwGRKBK/xM=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "cdf67ad78726cd7919984efbb83924ea47b4c0f1", + "rev": "c9f51464f2c2c9c75f3d7fdc58c157d252545dec", "type": "github" }, "original": { diff --git a/pkg/freetype/build.zig b/pkg/freetype/build.zig index 6bc5a25bb..add99b6ff 100644 --- a/pkg/freetype/build.zig +++ b/pkg/freetype/build.zig @@ -41,8 +41,8 @@ pub fn link( ) !*std.build.LibExeObjStep { const lib = try buildFreetype(b, step, opt); step.linkLibrary(lib); - step.addIncludePath(include_path); - step.addIncludePath(include_path_self); + step.addIncludePath(.{ .path = include_path }); + step.addIncludePath(.{ .path = include_path_self }); return lib; } @@ -59,7 +59,7 @@ pub fn buildFreetype( }); // Include - lib.addIncludePath(include_path); + lib.addIncludePath(.{ .path = include_path }); // Link lib.linkLibC(); @@ -70,7 +70,7 @@ pub fn buildFreetype( lib.linkSystemLibrary("libpng"); if (opt.libpng.include) |dirs| - for (dirs) |dir| lib.addIncludePath(dir); + for (dirs) |dir| lib.addIncludePath(.{ .path = dir }); } if (opt.zlib.enabled) { if (opt.zlib.step) |zlib| @@ -79,7 +79,7 @@ pub fn buildFreetype( lib.linkSystemLibrary("z"); if (opt.zlib.include) |dirs| - for (dirs) |dir| lib.addIncludePath(dir); + for (dirs) |dir| lib.addIncludePath(.{ .path = dir }); } // Compile @@ -100,16 +100,30 @@ pub fn buildFreetype( // C files lib.addCSourceFiles(srcs, flags.items); switch (target.getOsTag()) { - .linux => lib.addCSourceFile(root ++ "builds/unix/ftsystem.c", flags.items), - .windows => lib.addCSourceFile(root ++ "builds/windows/ftsystem.c", flags.items), - else => lib.addCSourceFile(root ++ "src/base/ftsystem.c", flags.items), + .linux => lib.addCSourceFile(.{ + .file = .{ .path = root ++ "builds/unix/ftsystem.c" }, + .flags = flags.items, + }), + .windows => lib.addCSourceFile(.{ + .file = .{ .path = root ++ "builds/windows/ftsystem.c" }, + .flags = flags.items, + }), + else => lib.addCSourceFile(.{ + .file = .{ .path = root ++ "src/base/ftsystem.c" }, + .flags = flags.items, + }), } switch (target.getOsTag()) { .windows => { - lib.addCSourceFile(root ++ "builds/windows/ftdebug.c", flags.items); - lib.addCSourceFile(root ++ "src/base/ftver.c", flags.items); + lib.addCSourceFiles(&.{ + root ++ "builds/windows/ftdebug.c", + root ++ "src/base/ftver.c", + }, flags.items); }, - else => lib.addCSourceFile(root ++ "src/base/ftdebug.c", flags.items), + else => lib.addCSourceFile(.{ + .file = .{ .path = root ++ "src/base/ftdebug.c" }, + .flags = flags.items, + }), } return lib; diff --git a/pkg/harfbuzz/build.zig b/pkg/harfbuzz/build.zig index c1370ef86..6d51156e5 100644 --- a/pkg/harfbuzz/build.zig +++ b/pkg/harfbuzz/build.zig @@ -45,7 +45,7 @@ pub fn link( ) !*std.build.LibExeObjStep { const lib = try buildHarfbuzz(b, step, opt); step.linkLibrary(lib); - step.addIncludePath(include_path); + step.addIncludePath(.{ .path = include_path }); return lib; } @@ -61,7 +61,7 @@ pub fn buildHarfbuzz( }); // Include - lib.addIncludePath(include_path); + lib.addIncludePath(.{ .path = include_path }); // Link lib.linkLibC(); @@ -73,7 +73,7 @@ pub fn buildHarfbuzz( lib.linkSystemLibrary("freetype2"); if (opt.freetype.include) |dirs| - for (dirs) |dir| lib.addIncludePath(dir); + for (dirs) |dir| lib.addIncludePath(.{ .path = dir }); } // Compile diff --git a/pkg/libpng/build.zig b/pkg/libpng/build.zig index a097e9240..0e98059ac 100644 --- a/pkg/libpng/build.zig +++ b/pkg/libpng/build.zig @@ -32,7 +32,7 @@ pub fn link( ) !*std.build.LibExeObjStep { const lib = try buildLib(b, step, opt); step.linkLibrary(lib); - step.addIncludePath(include_path); + step.addIncludePath(.{ .path = include_path }); return lib; } @@ -49,8 +49,8 @@ pub fn buildLib( }); // Include - lib.addIncludePath(include_path); - lib.addIncludePath(include_path_pnglibconf); + lib.addIncludePath(.{ .path = include_path }); + lib.addIncludePath(.{ .path = include_path_pnglibconf }); // Link lib.linkLibC(); @@ -64,7 +64,7 @@ pub fn buildLib( lib.linkSystemLibrary("z"); if (opt.zlib.include) |dirs| - for (dirs) |dir| lib.addIncludePath(dir); + for (dirs) |dir| lib.addIncludePath(.{ .path = dir }); // Compile var flags = std.ArrayList([]const u8).init(b.allocator); diff --git a/pkg/macos/build.zig b/pkg/macos/build.zig index a75087cdd..c9bd6b3ba 100644 --- a/pkg/macos/build.zig +++ b/pkg/macos/build.zig @@ -27,8 +27,14 @@ pub fn link( .target = step.target, .optimize = step.optimize, }); - step.addCSourceFile(comptime thisDir() ++ "/os/log.c", flags.items); - step.addCSourceFile(comptime thisDir() ++ "/text/ext.c", flags.items); + step.addCSourceFile(.{ + .file = .{ .path = comptime thisDir() ++ "/os/log.c" }, + .flags = flags.items, + }); + step.addCSourceFile(.{ + .file = .{ .path = comptime thisDir() ++ "/text/ext.c" }, + .flags = flags.items, + }); step.linkFramework("CoreFoundation"); step.linkFramework("CoreText"); return lib; diff --git a/pkg/pixman/build.zig b/pkg/pixman/build.zig index 77847fa75..bcee196d3 100644 --- a/pkg/pixman/build.zig +++ b/pkg/pixman/build.zig @@ -42,8 +42,8 @@ pub fn link( ) !*std.build.LibExeObjStep { const lib = try buildPixman(b, step, opt); step.linkLibrary(lib); - step.addIncludePath(include_path); - step.addIncludePath(include_path_self); + step.addIncludePath(.{ .path = include_path }); + step.addIncludePath(.{ .path = include_path_self }); return lib; } @@ -62,8 +62,8 @@ pub fn buildPixman( }); // Include - lib.addIncludePath(include_path); - lib.addIncludePath(include_path_self); + lib.addIncludePath(.{ .path = include_path }); + lib.addIncludePath(.{ .path = include_path_self }); // Link lib.linkLibC(); diff --git a/pkg/stb_image_resize/build.zig b/pkg/stb_image_resize/build.zig index 6a0deb2a8..00f0bec57 100644 --- a/pkg/stb_image_resize/build.zig +++ b/pkg/stb_image_resize/build.zig @@ -25,7 +25,7 @@ pub fn link( ) !*std.build.LibExeObjStep { const lib = try buildStbImageResize(b, step, opt); step.linkLibrary(lib); - inline for (include_paths) |path| step.addIncludePath(path); + inline for (include_paths) |path| step.addIncludePath(.{ .path = path }); return lib; } @@ -43,7 +43,7 @@ pub fn buildStbImageResize( }); // Include - inline for (include_paths) |path| lib.addIncludePath(path); + inline for (include_paths) |path| lib.addIncludePath(.{ .path = path }); // Link lib.linkLibC(); @@ -56,7 +56,10 @@ pub fn buildStbImageResize( }); // C files - lib.addCSourceFile(root ++ "/stb_image_resize.c", flags.items); + lib.addCSourceFile(.{ + .file = .{ .path = root ++ "/stb_image_resize.c" }, + .flags = flags.items, + }); return lib; } diff --git a/pkg/tracy/build.zig b/pkg/tracy/build.zig index 7894f00c3..23c94422d 100644 --- a/pkg/tracy/build.zig +++ b/pkg/tracy/build.zig @@ -16,7 +16,7 @@ fn thisDir() []const u8 { pub fn link(b: *std.Build, step: *std.build.LibExeObjStep) !*std.build.LibExeObjStep { const tracy = try buildTracy(b, step); step.linkLibrary(tracy); - step.addIncludePath(root); + step.addIncludePath(.{ .path = root }); return tracy; } @@ -45,11 +45,14 @@ pub fn buildTracy( }); } - lib.addIncludePath(root); - lib.addCSourceFile(try std.fs.path.join( - b.allocator, - &.{ root, "TracyClient.cpp" }, - ), flags.items); + lib.addIncludePath(.{ .path = root }); + lib.addCSourceFile(.{ + .file = .{ .path = try std.fs.path.join( + b.allocator, + &.{ root, "TracyClient.cpp" }, + ) }, + .flags = flags.items, + }); lib.linkLibC(); lib.linkSystemLibrary("c++"); diff --git a/pkg/utf8proc/build.zig b/pkg/utf8proc/build.zig index 23bfa8346..675c79630 100644 --- a/pkg/utf8proc/build.zig +++ b/pkg/utf8proc/build.zig @@ -19,7 +19,7 @@ fn thisDir() []const u8 { pub fn link(b: *std.Build, step: *std.build.LibExeObjStep) !*std.build.LibExeObjStep { const lib = try buildLib(b, step); step.linkLibrary(lib); - step.addIncludePath(include_path); + step.addIncludePath(.{ .path = include_path }); return lib; } @@ -34,7 +34,7 @@ pub fn buildLib( }); // Include - lib.addIncludePath(include_path); + lib.addIncludePath(.{ .path = include_path }); // Link lib.linkLibC(); diff --git a/pkg/zlib/build.zig b/pkg/zlib/build.zig index 7628479cc..fa2a57acb 100644 --- a/pkg/zlib/build.zig +++ b/pkg/zlib/build.zig @@ -18,7 +18,7 @@ fn thisDir() []const u8 { pub fn link(b: *std.build.Builder, step: *std.build.LibExeObjStep) !*std.build.LibExeObjStep { const lib = try buildLib(b, step); step.linkLibrary(lib); - step.addIncludePath(include_path); + step.addIncludePath(.{ .path = include_path }); return lib; } @@ -33,7 +33,7 @@ pub fn buildLib( }); // Include - lib.addIncludePath(include_path); + lib.addIncludePath(.{ .path = include_path }); // Link lib.linkLibC();