Skip to content

Fix build.zig v0.15 API breakage #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix build.zig v0.15 API breakage #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 39 additions & 38 deletions build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,20 @@ pub fn build(b: *std.Build) void {
const use_gles = b.option(bool, "gles", "Build with GLES; not supported on MacOS") orelse false;
const use_metal = b.option(bool, "metal", "Build with Metal; only supported on MacOS") orelse false;

const lib: *std.Build.Step.Compile = switch (shared) {
inline else => |x| switch (x) {
false => std.Build.addStaticLibrary,
true => std.Build.addSharedLibrary,
}(b, .{
.name = "glfw",
const lib: *std.Build.Step.Compile = b.addLibrary(.{
.name = "glfw",
.root_module = b.createModule(.{
.target = target,
.optimize = optimize,
.link_libc = true,
}),
};
lib.addIncludePath(b.path("include"));
.linkage = switch (shared) {
false => .static,
true => .dynamic,
},
});
lib.root_module.addIncludePath(b.path("include"));
//if (include_src) lib.addIncludePath(b.path("src"));
lib.linkLibC();

if (shared) lib.root_module.addCMacro("_GLFW_BUILD_DLL", "1");

Expand All @@ -54,12 +55,12 @@ pub fn build(b: *std.Build) void {
.target = target,
.optimize = optimize,
})) |dep| {
lib.linkLibrary(dep.artifact("x11-headers"));
lib.root_module.linkLibrary(dep.artifact("x11-headers"));
lib.installLibraryHeaders(dep.artifact("x11-headers"));
}
if (b.lazyDependency("wayland_headers", .{})) |dep| {
lib.addIncludePath(dep.path("wayland"));
lib.addIncludePath(dep.path("wayland-protocols"));
lib.root_module.addIncludePath(dep.path("wayland"));
lib.root_module.addIncludePath(dep.path("wayland-protocols"));
lib.installHeadersDirectory(dep.path("wayland"), ".", .{});
lib.installHeadersDirectory(dep.path("wayland-protocols"), ".", .{});
}
Expand All @@ -83,78 +84,78 @@ pub fn build(b: *std.Build) void {
//
// Source files
//
lib.addCSourceFiles(.{
lib.root_module.addCSourceFiles(.{
.files = &base_sources,
});
switch (target.result.os.tag) {
.windows => {
lib.linkSystemLibrary("gdi32");
lib.linkSystemLibrary("user32");
lib.linkSystemLibrary("shell32");
lib.root_module.linkSystemLibrary("gdi32", .{});
lib.root_module.linkSystemLibrary("user32", .{});
lib.root_module.linkSystemLibrary("shell32", .{});

if (use_opengl) {
lib.linkSystemLibrary("opengl32");
lib.root_module.linkSystemLibrary("opengl32", .{});
}

if (use_gles) {
lib.linkSystemLibrary("GLESv3");
lib.root_module.linkSystemLibrary("GLESv3", .{});
}

lib.root_module.addCMacro("_GLFW_WIN32", "1");
lib.addCSourceFiles(.{
lib.root_module.addCSourceFiles(.{
.files = &windows_sources,
});
},
.macos => {
// Transitive dependencies, explicit linkage of these works around
// ziglang/zig#17130
lib.linkFramework("CFNetwork");
lib.linkFramework("ApplicationServices");
lib.linkFramework("ColorSync");
lib.linkFramework("CoreText");
lib.linkFramework("ImageIO");
lib.root_module.linkFramework("CFNetwork", .{});
lib.root_module.linkFramework("ApplicationServices", .{});
lib.root_module.linkFramework("ColorSync", .{});
lib.root_module.linkFramework("CoreText", .{});
lib.root_module.linkFramework("ImageIO", .{});

// Direct dependencies
lib.linkSystemLibrary("objc");
lib.linkFramework("IOKit");
lib.linkFramework("CoreFoundation");
lib.linkFramework("AppKit");
lib.linkFramework("CoreServices");
lib.linkFramework("CoreGraphics");
lib.linkFramework("Foundation");
lib.linkFramework("QuartzCore");
lib.root_module.linkSystemLibrary("objc", .{});
lib.root_module.linkFramework("IOKit", .{});
lib.root_module.linkFramework("CoreFoundation", .{});
lib.root_module.linkFramework("AppKit", .{});
lib.root_module.linkFramework("CoreServices", .{});
lib.root_module.linkFramework("CoreGraphics", .{});
lib.root_module.linkFramework("Foundation", .{});
lib.root_module.linkFramework("QuartzCore", .{});

if (use_metal) {
lib.linkFramework("Metal");
lib.root_module.linkFramework("Metal", .{});
}

if (use_opengl) {
lib.linkFramework("OpenGL");
lib.root_module.linkFramework("OpenGL", .{});
}

lib.root_module.addCMacro("_GLFW_COCOA", "1");
lib.addCSourceFiles(.{
lib.root_module.addCSourceFiles(.{
.files = &macos_sources,
});
},

// everything that isn't windows or mac is linux :P
else => {
lib.addCSourceFiles(.{
lib.root_module.addCSourceFiles(.{
.files = &linux_sources,
});

if (use_x11) {
lib.root_module.addCMacro("_GLFW_X11", "1");
lib.addCSourceFiles(.{
lib.root_module.addCSourceFiles(.{
.files = &linux_x11_sources,
});
}

if (use_wl) {
lib.root_module.addCMacro("_GLFW_WAYLAND", "1");

lib.addCSourceFiles(.{
lib.root_module.addCSourceFiles(.{
.files = &linux_wl_sources,
.flags = &.{
"-Wno-implicit-function-declaration",
Expand Down
5 changes: 3 additions & 2 deletions build.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
.name = .glfw,
.version = "0.0.0",
.fingerprint = 0x3bbe0a5c521e9047,
.minimum_zig_version = "0.15.1",
.paths = .{
"include/",
"src/",
Expand All @@ -16,7 +17,7 @@
.lazy = true,
},
.vulkan_headers = .{
.url = "https://github.com/Batres3/vulkan-headers/archive/16dd91847f1b4ad2ac12578abca7596c3cecdab6.zip",
.url = "https://github.com/Batres3/vulkan-headers/archive/642b39a1f86f6f92ccdaaa52dc6106d59b7d92e2.zip",
.hash = "N-V-__8AAP4fFgE5rrh9TTp1H6c3Zqao6Cb_OYmRHQrOr4pY",
.lazy = true,
},
Expand All @@ -26,7 +27,7 @@
.lazy = true,
},
.x11_headers = .{
.url = "https://github.com/Batres3/x11-headers/archive/80dba49598570c241d2c0ba5ac045a2951d45cad.zip",
.url = "https://github.com/Batres3/x11-headers/archive/d85c0aed3f1ecc138c994ae00bb745c4cba9e574.zip",
.hash = "N-V-__8AABeUQgAUPAOubtaj8TZjdxYJ1rGLi4xxLDErTFwt",
.lazy = true,
},
Expand Down