zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

glfw: add intermediate static lib

Browse source 
Previously, @Avokadoen and @mattnite ran into issues including the GLFW library
in other projects, e.g. https://github.com/Avokadoen/zig_vulkan/issues/17

In #24 we removed the intermediate static library, which solved the issue. The
problem is that when the function is invoked in the directory of the project
including GLFW, then our code:

```
const lib = b.addStaticLibrary("glfw", "src/main.zig");
```

Would refer to the project's `src/main.zig` -- not the GLFW library `main.zig`.

Although removing the intermediate lib worked around the issue, it created a
new one - slower compilation: hexops/mach#31

This fixes the issue by ensuring that the path we pass to `addStaticLibrary` is
in fact absolute, not relative.

Fixes hexops/mach#31

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2021-10-24 13:50:14 -07:00
parent 668499b10a
commit a0677ea6a5
1 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

31
glfw/build.zig
View file

@ -37,6 +37,17 @@ pub const Options = struct {
}; };
pub fn link(b: *Builder, step: *std.build.LibExeObjStep, options: Options) void { pub fn link(b: *Builder, step: *std.build.LibExeObjStep, options: Options) void {
const lib = buildLibrary(b, step, options);
step.linkLibrary(lib);
linkGLFWDependencies(b, step, options);
}
fn buildLibrary(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *std.build.LibExeObjStep {
var main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/main.zig" }) catch unreachable;
const lib = b.addStaticLibrary("glfw", main_abs);
lib.setBuildMode(step.build_mode);
lib.setTarget(step.target);
const target = (std.zig.system.NativeTargetInfo.detect(b.allocator, step.target) catch unreachable).target; const target = (std.zig.system.NativeTargetInfo.detect(b.allocator, step.target) catch unreachable).target;
switch (target.os.tag) { switch (target.os.tag) {
.windows => { .windows => {
@ -64,10 +75,10 @@ pub fn link(b: *Builder, step: *std.build.LibExeObjStep, options: Options) void
var abs_path = std.fs.path.join(b.allocator, &.{ thisDir(), path }) catch unreachable; var abs_path = std.fs.path.join(b.allocator, &.{ thisDir(), path }) catch unreachable;
sources.append(abs_path) catch unreachable; sources.append(abs_path) catch unreachable;
} }
step.addCSourceFiles(sources.items, &.{"-D_GLFW_WIN32"}); lib.addCSourceFiles(sources.items, &.{"-D_GLFW_WIN32"});
}, },
.macos => { .macos => {
includeSdkMacOS(b, step); includeSdkMacOS(b, lib);
var sources = std.ArrayList([]const u8).init(b.allocator); var sources = std.ArrayList([]const u8).init(b.allocator);
for ([_][]const u8{ for ([_][]const u8{
// MacOS-specific sources // MacOS-specific sources
@ -92,7 +103,7 @@ pub fn link(b: *Builder, step: *std.build.LibExeObjStep, options: Options) void
var abs_path = std.fs.path.join(b.allocator, &.{ thisDir(), path }) catch unreachable; var abs_path = std.fs.path.join(b.allocator, &.{ thisDir(), path }) catch unreachable;
sources.append(abs_path) catch unreachable; sources.append(abs_path) catch unreachable;
} }
step.addCSourceFiles(sources.items, &.{"-D_GLFW_COCOA"}); lib.addCSourceFiles(sources.items, &.{"-D_GLFW_COCOA"});
}, },
else => { else => {
// Assume Linux-like // Assume Linux-like
@ -105,7 +116,7 @@ pub fn link(b: *Builder, step: *std.build.LibExeObjStep, options: Options) void
// thread 2004762 panic: attempt to unwrap error: LLDReportedFailure // thread 2004762 panic: attempt to unwrap error: LLDReportedFailure
// ``` // ```
step.target.abi = .gnu; step.target.abi = .gnu;
step.setTarget(step.target); lib.setTarget(step.target);
var general_sources = std.ArrayList([]const u8).init(b.allocator); var general_sources = std.ArrayList([]const u8).init(b.allocator);
const flag = switch (options.linux_window_manager) { const flag = switch (options.linux_window_manager) {
@ -131,7 +142,7 @@ pub fn link(b: *Builder, step: *std.build.LibExeObjStep, options: Options) void
var abs_path = std.fs.path.join(b.allocator, &.{ thisDir(), path }) catch unreachable; var abs_path = std.fs.path.join(b.allocator, &.{ thisDir(), path }) catch unreachable;
general_sources.append(abs_path) catch unreachable; general_sources.append(abs_path) catch unreachable;
} }
step.addCSourceFiles(general_sources.items, &.{flag}); lib.addCSourceFiles(general_sources.items, &.{flag});
switch (options.linux_window_manager) { switch (options.linux_window_manager) {
.X11 => { .X11 => {
@ -146,7 +157,7 @@ pub fn link(b: *Builder, step: *std.build.LibExeObjStep, options: Options) void
var abs_path = std.fs.path.join(b.allocator, &.{ thisDir(), path }) catch unreachable; var abs_path = std.fs.path.join(b.allocator, &.{ thisDir(), path }) catch unreachable;
x11_sources.append(abs_path) catch unreachable; x11_sources.append(abs_path) catch unreachable;
} }
step.addCSourceFiles(x11_sources.items, &.{flag}); lib.addCSourceFiles(x11_sources.items, &.{flag});
}, },
.Wayland => { .Wayland => {
var wayland_sources = std.ArrayList([]const u8).init(b.allocator); var wayland_sources = std.ArrayList([]const u8).init(b.allocator);
@ -158,19 +169,21 @@ pub fn link(b: *Builder, step: *std.build.LibExeObjStep, options: Options) void
var abs_path = std.fs.path.join(b.allocator, &.{ thisDir(), path }) catch unreachable; var abs_path = std.fs.path.join(b.allocator, &.{ thisDir(), path }) catch unreachable;
wayland_sources.append(abs_path) catch unreachable; wayland_sources.append(abs_path) catch unreachable;
} }
step.addCSourceFiles(wayland_sources.items, &.{flag}); lib.addCSourceFiles(wayland_sources.items, &.{flag});
}, },
} }
}, },
} }
linkGLFW(b, step, options); linkGLFWDependencies(b, lib, options);
lib.install();
return lib;
} }
fn thisDir() []const u8 { fn thisDir() []const u8 {
return std.fs.path.dirname(@src().file) orelse "."; return std.fs.path.dirname(@src().file) orelse ".";
} }
fn linkGLFW(b: *Builder, step: *std.build.LibExeObjStep, options: Options) void { fn linkGLFWDependencies(b: *Builder, step: *std.build.LibExeObjStep, options: Options) void {
var include_dir = std.fs.path.join(b.allocator, &.{ thisDir(), "upstream/glfw/include" }) catch unreachable; var include_dir = std.fs.path.join(b.allocator, &.{ thisDir(), "upstream/glfw/include" }) catch unreachable;
defer b.allocator.free(include_dir); defer b.allocator.free(include_dir);
step.addIncludeDir(include_dir); step.addIncludeDir(include_dir);