Add include paths to modules in pkg/

This commit is contained in:
Krzysztof Wolicki
2024-01-07 17:39:39 +01:00
parent eb4ede8b6f
commit 9e14a7ea62
4 changed files with 10 additions and 3 deletions

View File

@ -13,7 +13,7 @@ pub fn build(b: *std.Build) !void {
) orelse (target.result.os.tag != .windows); ) orelse (target.result.os.tag != .windows);
const freetype_enabled = b.option(bool, "enable-freetype", "Build freetype") orelse true; 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 upstream = b.dependency("fontconfig", .{});
const lib = b.addStaticLibrary(.{ const lib = b.addStaticLibrary(.{
@ -40,6 +40,8 @@ pub fn build(b: *std.Build) !void {
lib.addIncludePath(upstream.path("")); lib.addIncludePath(upstream.path(""));
lib.addIncludePath(.{ .path = "override/include" }); lib.addIncludePath(.{ .path = "override/include" });
module.addIncludePath(upstream.path(""));
module.addIncludePath(.{ .path = "override/include" });
var flags = std.ArrayList([]const u8).init(b.allocator); var flags = std.ArrayList([]const u8).init(b.allocator);
defer flags.deinit(); defer flags.deinit();

View File

@ -4,12 +4,15 @@ pub fn build(b: *std.Build) !void {
const target = b.standardTargetOptions(.{}); const target = b.standardTargetOptions(.{});
const optimize = b.standardOptimizeOption(.{}); 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 upstream = b.dependency("glslang", .{});
const lib = try buildGlslang(b, upstream, target, optimize); const lib = try buildGlslang(b, upstream, target, optimize);
b.installArtifact(lib); b.installArtifact(lib);
module.addIncludePath(upstream.path(""));
module.addIncludePath(.{ .path = "override" });
{ {
const test_exe = b.addTest(.{ const test_exe = b.addTest(.{
.name = "test", .name = "test",

View File

@ -32,6 +32,7 @@ pub fn build(b: *std.Build) !void {
lib.linkLibC(); lib.linkLibC();
lib.linkLibCpp(); lib.linkLibCpp();
lib.addIncludePath(upstream.path("src")); lib.addIncludePath(upstream.path("src"));
module.addIncludePath(upstream.path("src"));
const freetype_dep = b.dependency("freetype", .{ .target = target, .optimize = optimize }); const freetype_dep = b.dependency("freetype", .{ .target = target, .optimize = optimize });
lib.linkLibrary(freetype_dep.artifact("freetype")); lib.linkLibrary(freetype_dep.artifact("freetype"));

View File

@ -5,10 +5,11 @@ pub fn build(b: *std.Build) !void {
const target = b.standardTargetOptions(.{}); const target = b.standardTargetOptions(.{});
const optimize = b.standardOptimizeOption(.{}); 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 upstream = b.dependency("oniguruma", .{});
const lib = try buildOniguruma(b, upstream, target, optimize); const lib = try buildOniguruma(b, upstream, target, optimize);
module.addIncludePath(upstream.path("src"));
b.installArtifact(lib); b.installArtifact(lib);
{ {