From 9e14a7ea62744fe248235b6959f670048503faf4 Mon Sep 17 00:00:00 2001
From: Krzysztof Wolicki <der.teufel.mail@gmail.com>
Date: Sun, 7 Jan 2024 17:39:39 +0100
Subject: [PATCH] Add include paths to modules in pkg/

---
 pkg/fontconfig/build.zig | 4 +++-
 pkg/glslang/build.zig    | 5 ++++-
 pkg/harfbuzz/build.zig   | 1 +
 pkg/oniguruma/build.zig  | 3 ++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkg/fontconfig/build.zig b/pkg/fontconfig/build.zig
index 8009227e2..e2faf44cb 100644
--- a/pkg/fontconfig/build.zig
+++ b/pkg/fontconfig/build.zig
@@ -13,7 +13,7 @@ pub fn build(b: *std.Build) !void {
     ) orelse (target.result.os.tag != .windows);
     const freetype_enabled = b.option(bool, "enable-freetype", "Build freetype") orelse true;
 
-    _ = b.addModule("fontconfig", .{ .root_source_file = .{ .path = "main.zig" } });
+    const module = b.addModule("fontconfig", .{ .root_source_file = .{ .path = "main.zig" } });
 
     const upstream = b.dependency("fontconfig", .{});
     const lib = b.addStaticLibrary(.{
@@ -40,6 +40,8 @@ pub fn build(b: *std.Build) !void {
 
     lib.addIncludePath(upstream.path(""));
     lib.addIncludePath(.{ .path = "override/include" });
+    module.addIncludePath(upstream.path(""));
+    module.addIncludePath(.{ .path = "override/include" });
 
     var flags = std.ArrayList([]const u8).init(b.allocator);
     defer flags.deinit();
diff --git a/pkg/glslang/build.zig b/pkg/glslang/build.zig
index e699bd595..d73306071 100644
--- a/pkg/glslang/build.zig
+++ b/pkg/glslang/build.zig
@@ -4,12 +4,15 @@ pub fn build(b: *std.Build) !void {
     const target = b.standardTargetOptions(.{});
     const optimize = b.standardOptimizeOption(.{});
 
-    _ = b.addModule("glslang", .{ .root_source_file = .{ .path = "main.zig" } });
+    const module = b.addModule("glslang", .{ .root_source_file = .{ .path = "main.zig" } });
 
     const upstream = b.dependency("glslang", .{});
     const lib = try buildGlslang(b, upstream, target, optimize);
     b.installArtifact(lib);
 
+    module.addIncludePath(upstream.path(""));
+    module.addIncludePath(.{ .path = "override" });
+
     {
         const test_exe = b.addTest(.{
             .name = "test",
diff --git a/pkg/harfbuzz/build.zig b/pkg/harfbuzz/build.zig
index d7a950414..dd2ba87d5 100644
--- a/pkg/harfbuzz/build.zig
+++ b/pkg/harfbuzz/build.zig
@@ -32,6 +32,7 @@ pub fn build(b: *std.Build) !void {
     lib.linkLibC();
     lib.linkLibCpp();
     lib.addIncludePath(upstream.path("src"));
+    module.addIncludePath(upstream.path("src"));
 
     const freetype_dep = b.dependency("freetype", .{ .target = target, .optimize = optimize });
     lib.linkLibrary(freetype_dep.artifact("freetype"));
diff --git a/pkg/oniguruma/build.zig b/pkg/oniguruma/build.zig
index 9d51971d5..9fa8772cd 100644
--- a/pkg/oniguruma/build.zig
+++ b/pkg/oniguruma/build.zig
@@ -5,10 +5,11 @@ pub fn build(b: *std.Build) !void {
     const target = b.standardTargetOptions(.{});
     const optimize = b.standardOptimizeOption(.{});
 
-    _ = b.addModule("oniguruma", .{ .root_source_file = .{ .path = "main.zig" } });
+    const module = b.addModule("oniguruma", .{ .root_source_file = .{ .path = "main.zig" } });
 
     const upstream = b.dependency("oniguruma", .{});
     const lib = try buildOniguruma(b, upstream, target, optimize);
+    module.addIncludePath(upstream.path("src"));
     b.installArtifact(lib);
 
     {