working on more zig breaking changes

This commit is contained in:
Mitchell Hashimoto
2024-04-11 09:21:51 -04:00
parent d8cc05317a
commit 595f24585e
17 changed files with 83 additions and 94 deletions

View File

@@ -79,12 +79,11 @@ pub fn build(b: *std.Build) !void {
}
}
lib.installHeadersDirectoryOptions(.{
.source_dir = .{ .path = "vendor" },
.install_dir = .header,
.install_subdir = "",
.include_extensions = &.{".h"},
});
lib.installHeadersDirectory(
.{ .path = "vendor" },
"",
.{ .include_extensions = &.{".h"} },
);
b.installArtifact(lib);

View File

@@ -162,12 +162,11 @@ pub fn build(b: *std.Build) !void {
.flags = flags.items,
});
lib.installHeadersDirectoryOptions(.{
.source_dir = upstream.path("fontconfig"),
.install_dir = .header,
.install_subdir = "fontconfig",
.include_extensions = &.{".h"},
});
lib.installHeadersDirectory(
upstream.path("fontconfig"),
"fontconfig",
.{ .include_extensions = &.{".h"} },
);
b.installArtifact(lib);

View File

@@ -81,13 +81,12 @@ pub fn build(b: *std.Build) !void {
}),
}
lib.installHeader("freetype-zig.h", "freetype-zig.h");
lib.installHeadersDirectoryOptions(.{
.source_dir = upstream.path("include"),
.install_dir = .header,
.install_subdir = "",
.include_extensions = &.{".h"},
});
lib.installHeader(.{ .path = "freetype-zig.h" }, "freetype-zig.h");
lib.installHeadersDirectory(
upstream.path("include"),
"",
.{ .include_extensions = &.{".h"} },
);
b.installArtifact(lib);

View File

@@ -141,12 +141,11 @@ fn buildGlslang(
});
}
lib.installHeadersDirectoryOptions(.{
.source_dir = upstream.path(""),
.install_dir = .header,
.install_subdir = "",
.include_extensions = &.{".h"},
});
lib.installHeadersDirectory(
upstream.path(""),
"",
.{ .include_extensions = &.{".h"} },
);
return lib;
}

View File

@@ -76,12 +76,11 @@ pub fn build(b: *std.Build) !void {
.file = upstream.path("src/harfbuzz.cc"),
.flags = flags.items,
});
lib.installHeadersDirectoryOptions(.{
.source_dir = upstream.path("src"),
.install_dir = .header,
.install_subdir = "",
.include_extensions = &.{".h"},
});
lib.installHeadersDirectory(
upstream.path("src"),
"",
.{ .include_extensions = &.{".h"} },
);
b.installArtifact(lib);

View File

@@ -84,12 +84,11 @@ pub fn build(b: *std.Build) !void {
"hwy/timer.cc",
},
});
lib.installHeadersDirectoryOptions(.{
.source_dir = upstream.path("hwy"),
.install_dir = .header,
.install_subdir = "hwy",
.include_extensions = &.{".h"},
});
lib.installHeadersDirectory(
upstream.path("hwy"),
"hwy",
.{ .include_extensions = &.{".h"} },
);
b.installArtifact(lib);

View File

@@ -40,13 +40,12 @@ pub fn build(b: *std.Build) !void {
.flags = flags.items,
});
lib.installHeader("pnglibconf.h", "pnglibconf.h");
lib.installHeadersDirectoryOptions(.{
.source_dir = upstream.path(""),
.install_dir = .header,
.install_subdir = "",
.include_extensions = &.{".h"},
});
lib.installHeader(.{ .path = "pnglibconf.h" }, "pnglibconf.h");
lib.installHeadersDirectory(
upstream.path(""),
"",
.{ .include_extensions = &.{".h"} },
);
b.installArtifact(lib);
}

View File

@@ -100,13 +100,15 @@ pub fn build(b: *std.Build) !void {
.flags = flags.items,
});
lib.installHeader("override/include/libxml/xmlversion.h", "libxml/xmlversion.h");
lib.installHeadersDirectoryOptions(.{
.source_dir = upstream.path("include"),
.install_dir = .header,
.install_subdir = "",
.include_extensions = &.{".h"},
});
lib.installHeader(
.{ .path = "override/include/libxml/xmlversion.h" },
"libxml/xmlversion.h",
);
lib.installHeadersDirectory(
upstream.path("include"),
"",
.{ .include_extensions = &.{".h"} },
);
b.installArtifact(lib);
}

View File

@@ -125,12 +125,11 @@ fn buildOniguruma(
},
});
lib.installHeadersDirectoryOptions(.{
.source_dir = upstream.path("src"),
.install_dir = .header,
.install_subdir = "",
.include_extensions = &.{".h"},
});
lib.installHeadersDirectory(
upstream.path("src"),
"",
.{ .include_extensions = &.{".h"} },
);
return lib;
}

View File

@@ -62,13 +62,12 @@ pub fn build(b: *std.Build) !void {
.flags = flags.items,
});
lib.installHeader("pixman-version.h", "pixman-version.h");
lib.installHeadersDirectoryOptions(.{
.source_dir = upstream.path("pixman"),
.install_dir = .header,
.install_subdir = "",
.include_extensions = &.{".h"},
});
lib.installHeader(.{ .path = "pixman-version.h" }, "pixman-version.h");
lib.installHeadersDirectory(
upstream.path("pixman"),
"",
.{ .include_extensions = &.{".h"} },
);
b.installArtifact(lib);

View File

@@ -27,12 +27,11 @@ pub fn build(b: *std.Build) !void {
"vendor/simdutf.cpp",
},
});
lib.installHeadersDirectoryOptions(.{
.source_dir = .{ .path = "vendor" },
.install_dir = .header,
.install_subdir = "",
.include_extensions = &.{".h"},
});
lib.installHeadersDirectory(
.{ .path = "vendor" },
"",
.{ .include_extensions = &.{".h"} },
);
b.installArtifact(lib);

View File

@@ -78,12 +78,11 @@ fn buildSpirvCross(
},
});
lib.installHeadersDirectoryOptions(.{
.source_dir = upstream.path(""),
.install_dir = .header,
.install_subdir = "",
.include_extensions = &.{".h"},
});
lib.installHeadersDirectory(
upstream.path(""),
"",
.{ .include_extensions = &.{".h"} },
);
return lib;
}

View File

@@ -27,12 +27,11 @@ pub fn build(b: *std.Build) !void {
.flags = flags.items,
.files = &.{"empty.cc"},
});
lib.installHeadersDirectoryOptions(.{
.source_dir = upstream.path("source"),
.install_dir = .header,
.install_subdir = "",
.include_extensions = &.{".h"},
});
lib.installHeadersDirectory(
upstream.path("source"),
"",
.{ .include_extensions = &.{".h"} },
);
b.installArtifact(lib);

View File

@@ -18,12 +18,11 @@ pub fn build(b: *std.Build) !void {
try apple_sdk.addPaths(b, &lib.root_module);
}
lib.installHeadersDirectoryOptions(.{
.source_dir = upstream.path(""),
.install_dir = .header,
.install_subdir = "",
.include_extensions = &.{".h"},
});
lib.installHeadersDirectory(
upstream.path(""),
"",
.{ .include_extensions = &.{".h"} },
);
var flags = std.ArrayList([]const u8).init(b.allocator);
defer flags.deinit();