falsepattern/zig-glfw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

all: build: thisDir improvements (#570)

Browse source 
* build:all: thisDir improvements

more performant output, usage code reducement and compileError for wrong usage

* glfw: update deprecated code
This commit is contained in:
Ali Chraghi 2022-09-29 19:11:46 +03:30 • committed by GitHub
parent 56b6222b2f
commit ade12bcd14
2 changed files with 30 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
build.zig
View file

@ -4,17 +4,17 @@ const Builder = std.build.Builder;
const system_sdk = @import("system_sdk.zig"); const system_sdk = @import("system_sdk.zig");
pub fn build(b: *Builder) void { pub fn build(b: *Builder) !void {
const mode = b.standardReleaseOptions(); const mode = b.standardReleaseOptions();
const target = b.standardTargetOptions(.{}); const target = b.standardTargetOptions(.{});
const test_step = b.step("test", "Run library tests"); const test_step = b.step("test", "Run library tests");
test_step.dependOn(&testStep(b, mode, target).step); test_step.dependOn(&(try testStep(b, mode, target)).step);
test_step.dependOn(&testStepShared(b, mode, target).step); test_step.dependOn(&(try testStepShared(b, mode, target)).step);
} }
pub fn testStep(b: *Builder, mode: std.builtin.Mode, target: std.zig.CrossTarget) !*std.build.RunStep { pub fn testStep(b: *Builder, mode: std.builtin.Mode, target: std.zig.CrossTarget) !*std.build.RunStep {
const main_tests = b.addTestExe("glfw-tests", thisDir() ++ "/src/main.zig"); const main_tests = b.addTestExe("glfw-tests", sdkPath("/src/main.zig"));
main_tests.setBuildMode(mode); main_tests.setBuildMode(mode);
main_tests.setTarget(target); main_tests.setTarget(target);
try link(b, main_tests, .{}); try link(b, main_tests, .{});
@ -23,7 +23,7 @@ pub fn testStep(b: *Builder, mode: std.builtin.Mode, target: std.zig.CrossTarget
} }
fn testStepShared(b: *Builder, mode: std.builtin.Mode, target: std.zig.CrossTarget) !*std.build.RunStep { fn testStepShared(b: *Builder, mode: std.builtin.Mode, target: std.zig.CrossTarget) !*std.build.RunStep {
const main_tests = b.addTestExe("glfw-tests-shared", thisDir() ++ "/src/main.zig"); const main_tests = b.addTestExe("glfw-tests-shared", sdkPath("/src/main.zig"));
main_tests.setBuildMode(mode); main_tests.setBuildMode(mode);
main_tests.setTarget(target); main_tests.setTarget(target);
try link(b, main_tests, .{ .shared = true }); try link(b, main_tests, .{ .shared = true });
@ -66,7 +66,7 @@ pub const Options = struct {
pub const pkg = std.build.Pkg{ pub const pkg = std.build.Pkg{
.name = "glfw", .name = "glfw",
.source = .{ .path = thisDir() ++ "/src/main.zig" }, .source = .{ .path = sdkPath("/src/main.zig") },
}; };
// TODO(self-hosted): HACK: workaround https://github.com/ziglang/zig/issues/12784 // TODO(self-hosted): HACK: workaround https://github.com/ziglang/zig/issues/12784
@ -74,9 +74,9 @@ pub const pkg = std.build.Pkg{
// Extracted from a build using stage1 from zig-cache/ (`cimport/c_darwin_native.zig`) // Extracted from a build using stage1 from zig-cache/ (`cimport/c_darwin_native.zig`)
// Then find+replace `= ?fn` -> `= ?*const fn` // Then find+replace `= ?fn` -> `= ?*const fn`
fn cimportWorkaround() void { fn cimportWorkaround() void {
const dest_dir = std.fs.cwd().openDir(thisDir() ++ "/src", .{}) catch unreachable; const dest_dir = std.fs.cwd().openDir(sdkPath("/src"), .{}) catch unreachable;
const cn_path = thisDir() ++ "/src/cimport/" ++ if (builtin.os.tag == .macos) "c_darwin_native.zig" else "c_normal_native.zig"; const cn_path = sdkPath("/src/cimport/" ++ if (builtin.os.tag == .macos) "c_darwin_native.zig" else "c_normal_native.zig");
std.fs.cwd().copyFile(cn_path, dest_dir, thisDir() ++ "/src/c_native.zig", .{}) catch unreachable; std.fs.cwd().copyFile(cn_path, dest_dir, sdkPath("/src/c_native.zig"), .{}) catch unreachable;
} }
pub const LinkError = error{FailedToLinkGPU} || BuildError; pub const LinkError = error{FailedToLinkGPU} || BuildError;
@ -120,21 +120,21 @@ fn buildLibrary(b: *Builder, mode: std.builtin.Mode, target: std.zig.CrossTarget
} }
fn addGLFWIncludes(step: *std.build.LibExeObjStep) void { fn addGLFWIncludes(step: *std.build.LibExeObjStep) void {
step.addIncludePath(thisDir() ++ "/upstream/glfw/include"); step.addIncludePath(sdkPath("/upstream/glfw/include"));
step.addIncludePath(thisDir() ++ "/upstream/vulkan_headers/include"); step.addIncludePath(sdkPath("/upstream/vulkan_headers/include"));
} }
fn addGLFWSources(b: *Builder, lib: *std.build.LibExeObjStep, options: Options) std.mem.Allocator.Error!void { fn addGLFWSources(b: *Builder, lib: *std.build.LibExeObjStep, options: Options) std.mem.Allocator.Error!void {
const include_glfw_src = "-I" ++ thisDir() ++ "/upstream/glfw/src"; const include_glfw_src = comptime "-I" ++ sdkPath("/upstream/glfw/src");
switch (lib.target_info.target.os.tag) { switch (lib.target_info.target.os.tag) {
.windows => lib.addCSourceFiles(&.{ .windows => lib.addCSourceFiles(&.{
thisDir() ++ "/src/sources_all.c", sdkPath("/src/sources_all.c"),
thisDir() ++ "/src/sources_windows.c", sdkPath("/src/sources_windows.c"),
}, &.{ "-D_GLFW_WIN32", include_glfw_src }), }, &.{ "-D_GLFW_WIN32", include_glfw_src }),
.macos => lib.addCSourceFiles(&.{ .macos => lib.addCSourceFiles(&.{
thisDir() ++ "/src/sources_all.c", sdkPath("/src/sources_all.c"),
thisDir() ++ "/src/sources_macos.m", sdkPath("/src/sources_macos.m"),
thisDir() ++ "/src/sources_macos.c", sdkPath("/src/sources_macos.c"),
}, &.{ "-D_GLFW_COCOA", include_glfw_src }), }, &.{ "-D_GLFW_COCOA", include_glfw_src }),
else => { else => {
// TODO(future): for now, Linux can't be built with musl: // TODO(future): for now, Linux can't be built with musl:
@ -145,17 +145,17 @@ fn addGLFWSources(b: *Builder, lib: *std.build.LibExeObjStep, options: Options)
// ``` // ```
var sources = std.ArrayList([]const u8).init(b.allocator); var sources = std.ArrayList([]const u8).init(b.allocator);
var flags = std.ArrayList([]const u8).init(b.allocator); var flags = std.ArrayList([]const u8).init(b.allocator);
try sources.append(thisDir() ++ "/src/sources_all.c"); try sources.append(sdkPath("/src/sources_all.c"));
try sources.append(thisDir() ++ "/src/sources_linux.c"); try sources.append(sdkPath("/src/sources_linux.c"));
if (options.x11) { if (options.x11) {
try sources.append(thisDir() ++ "/src/sources_linux_x11.c"); try sources.append(sdkPath("/src/sources_linux_x11.c"));
try flags.append("-D_GLFW_X11"); try flags.append("-D_GLFW_X11");
} }
if (options.wayland) { if (options.wayland) {
try sources.append(thisDir() ++ "/src/sources_linux_wayland.c"); try sources.append(sdkPath("/src/sources_linux_wayland.c"));
try flags.append("-D_GLFW_WAYLAND"); try flags.append("-D_GLFW_WAYLAND");
} }
try flags.append("-I" ++ thisDir() ++ "/upstream/glfw/src"); try flags.append(comptime "-I" ++ sdkPath("/upstream/glfw/src"));
// TODO(upstream): glfw can't compile on clang15 without this flag // TODO(upstream): glfw can't compile on clang15 without this flag
try flags.append("-Wno-implicit-function-declaration"); try flags.append("-Wno-implicit-function-declaration");
@ -209,13 +209,17 @@ fn ensureDependencySubmodule(allocator: std.mem.Allocator, path: []const u8) !vo
if (std.mem.eql(u8, no_ensure_submodules, "true")) return; if (std.mem.eql(u8, no_ensure_submodules, "true")) return;
} else |_| {} } else |_| {}
var child = std.ChildProcess.init(&.{ "git", "submodule", "update", "--init", path }, allocator); var child = std.ChildProcess.init(&.{ "git", "submodule", "update", "--init", path }, allocator);
child.cwd = thisDir(); child.cwd = sdkPath("/");
child.stderr = std.io.getStdErr(); child.stderr = std.io.getStdErr();
child.stdout = std.io.getStdOut(); child.stdout = std.io.getStdOut();
_ = try child.spawnAndWait(); _ = try child.spawnAndWait();
} }
inline fn thisDir() []const u8 { fn sdkPath(comptime suffix: []const u8) []const u8 {
return comptime std.fs.path.dirname(@src().file) orelse "."; if (suffix[0] != '/') @compileError("suffix must be an absolute path");
return comptime blk: {
const root_dir = std.fs.path.dirname(@src().file) orelse ".";
break :blk root_dir ++ suffix;
};
} }

2
src/Window.zig
View file

@ -2420,7 +2420,7 @@ pub inline fn setDropCallback(self: Window, comptime callback: ?fn (window: Wind
inline fn hint(h: Hint, value: anytype) void { inline fn hint(h: Hint, value: anytype) void {
internal_debug.assertInitialized(); internal_debug.assertInitialized();
const value_type = @TypeOf(value); const value_type = @TypeOf(value);
const value_type_info: std.builtin.TypeInfo = @typeInfo(value_type); const value_type_info: std.builtin.Type = @typeInfo(value_type);
switch (value_type_info) { switch (value_type_info) {
.Int, .ComptimeInt => { .Int, .ComptimeInt => {