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

---
 pkg/cimgui/build.zig      |  3 ++-
 pkg/harfbuzz/build.zig    |  1 +
 pkg/opengl/build.zig      |  3 ++-
 pkg/pixman/build.zig      | 15 ++++++++-------
 pkg/spirv-cross/build.zig |  6 ++++--
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/pkg/cimgui/build.zig b/pkg/cimgui/build.zig
index 7a7957752..235b681fe 100644
--- a/pkg/cimgui/build.zig
+++ b/pkg/cimgui/build.zig
@@ -5,7 +5,7 @@ pub fn build(b: *std.Build) !void {
     const target = b.standardTargetOptions(.{});
     const optimize = b.standardOptimizeOption(.{});
 
-    _ = b.addModule("cimgui", .{ .root_source_file = .{ .path = "main.zig" } });
+    const module = b.addModule("cimgui", .{ .root_source_file = .{ .path = "main.zig" } });
 
     const imgui = b.dependency("imgui", .{});
     const freetype = b.dependency("freetype", .{
@@ -26,6 +26,7 @@ pub fn build(b: *std.Build) !void {
     }
 
     lib.addIncludePath(imgui.path(""));
+    module.addIncludePath(.{ .path = "vendor" });
 
     var flags = std.ArrayList([]const u8).init(b.allocator);
     defer flags.deinit();
diff --git a/pkg/harfbuzz/build.zig b/pkg/harfbuzz/build.zig
index dd2ba87d5..08a2dc185 100644
--- a/pkg/harfbuzz/build.zig
+++ b/pkg/harfbuzz/build.zig
@@ -36,6 +36,7 @@ pub fn build(b: *std.Build) !void {
 
     const freetype_dep = b.dependency("freetype", .{ .target = target, .optimize = optimize });
     lib.linkLibrary(freetype_dep.artifact("freetype"));
+    module.addIncludePath(freetype_dep.builder.dependency("freetype", .{}).path("include"));
 
     var flags = std.ArrayList([]const u8).init(b.allocator);
     defer flags.deinit();
diff --git a/pkg/opengl/build.zig b/pkg/opengl/build.zig
index 5d4cb16fa..440b96ba0 100644
--- a/pkg/opengl/build.zig
+++ b/pkg/opengl/build.zig
@@ -1,5 +1,6 @@
 const std = @import("std");
 
 pub fn build(b: *std.Build) !void {
-    _ = b.addModule("opengl", .{ .root_source_file = .{ .path = "main.zig" } });
+    const module = b.addModule("opengl", .{ .root_source_file = .{ .path = "main.zig" } });
+    module.addIncludePath(.{ .path = "../../vendor/glad/include" });
 }
diff --git a/pkg/pixman/build.zig b/pkg/pixman/build.zig
index cee740abe..a74fece29 100644
--- a/pkg/pixman/build.zig
+++ b/pkg/pixman/build.zig
@@ -13,12 +13,14 @@ pub fn build(b: *std.Build) !void {
         .optimize = optimize,
     });
     lib.linkLibC();
-    if (!(target.result.os.tag == .windows)) {
+    if (target.result.os.tag != .windows) {
         lib.linkSystemLibrary("pthread");
     }
 
     lib.addIncludePath(upstream.path(""));
     lib.addIncludePath(.{ .path = "" });
+    module.addIncludePath(upstream.path("pixman"));
+    module.addIncludePath(.{ .path = "" });
 
     var flags = std.ArrayList([]const u8).init(b.allocator);
     defer flags.deinit();
@@ -50,12 +52,11 @@ pub fn build(b: *std.Build) !void {
         });
     }
 
-    for (srcs) |src| {
-        lib.addCSourceFile(.{
-            .file = upstream.path(src),
-            .flags = flags.items,
-        });
-    }
+    lib.addCSourceFiles(.{
+        .dependency = upstream,
+        .files = srcs,
+        .flags = flags.items,
+    });
 
     lib.installHeader("pixman-version.h", "pixman-version.h");
     lib.installHeadersDirectoryOptions(.{
diff --git a/pkg/spirv-cross/build.zig b/pkg/spirv-cross/build.zig
index 9206deb83..76b29a279 100644
--- a/pkg/spirv-cross/build.zig
+++ b/pkg/spirv-cross/build.zig
@@ -4,9 +4,11 @@ pub fn build(b: *std.Build) !void {
     const target = b.standardTargetOptions(.{});
     const optimize = b.standardOptimizeOption(.{});
 
-    _ = b.addModule("spirv_cross", .{ .root_source_file = .{ .path = "main.zig" } });
-
     const upstream = b.dependency("spirv_cross", .{});
+
+    const module = b.addModule("spirv_cross", .{ .root_source_file = .{ .path = "main.zig" } });
+    module.addIncludePath(upstream.path(""));
+
     const lib = try buildSpirvCross(b, upstream, target, optimize);
     b.installArtifact(lib);