Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-08-02 14:57:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

update to latest Zig nightly

Browse Source
This commit is contained in:
Mitchell Hashimoto
2022-09-14 19:34:19 -07:00
parent f5319f1ca6
commit f3f2c3df26
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.zig
View File

@ -2,7 +2,7 @@ const std = @import("std");
const fs = std.fs; const fs = std.fs;
const Builder = std.build.Builder; const Builder = std.build.Builder;
const LibExeObjStep = std.build.LibExeObjStep; const LibExeObjStep = std.build.LibExeObjStep;
const glfw = @import("vendor/mach/glfw/build.zig"); const glfw = @import("vendor/mach/libs/glfw/build.zig");
const fontconfig = @import("pkg/fontconfig/build.zig"); const fontconfig = @import("pkg/fontconfig/build.zig");
const freetype = @import("pkg/freetype/build.zig"); const freetype = @import("pkg/freetype/build.zig");
const harfbuzz = @import("pkg/harfbuzz/build.zig"); const harfbuzz = @import("pkg/harfbuzz/build.zig");
@ -12,7 +12,7 @@ const libpng = @import("pkg/libpng/build.zig");
const utf8proc = @import("pkg/utf8proc/build.zig"); const utf8proc = @import("pkg/utf8proc/build.zig");
const zlib = @import("pkg/zlib/build.zig"); const zlib = @import("pkg/zlib/build.zig");
const tracylib = @import("pkg/tracy/build.zig"); const tracylib = @import("pkg/tracy/build.zig");
const system_sdk = @import("vendor/mach/glfw/system_sdk.zig"); const system_sdk = @import("vendor/mach/libs/glfw/system_sdk.zig");
// Build options, see the build options help for more info. // Build options, see the build options help for more info.
var tracy: bool = false; var tracy: bool = false;

6
flake.lock generated
View File

@ -109,11 +109,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1662668669, "lastModified": 1663201789,
"narHash": "sha256-91R5xjCt1cLJBbYygtiQwXCex596/2cxsTneKUdnVwc=", "narHash": "sha256-yFljEVJ38ublnig6vxa9HOqSybzhc00JkDtlGGTejxk=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "6ed17531becf61347f4f30b62ad22d21e14fc4da", "rev": "0be33c4346338b983b4a67bbd3ee9a46cf97128f",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
pkg/fontconfig/build.zig
View File

@ -145,6 +145,9 @@ pub fn buildFontconfig(
// https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/231 // https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/231
"-fno-sanitize=undefined", "-fno-sanitize=undefined",
"-fno-sanitize-trap=undefined", "-fno-sanitize-trap=undefined",
"-Wno-int-conversion",
"-Wno-implicit-function-declaration",
}); });
const arch = target.cpu_arch orelse builtin.cpu.arch; const arch = target.cpu_arch orelse builtin.cpu.arch;
switch (arch.ptrBitWidth()) { switch (arch.ptrBitWidth()) {

2
src/Window.zig
View File

@ -979,8 +979,6 @@ fn mouseButtonCallback(
glfw_action: glfw.Action, glfw_action: glfw.Action,
mods: glfw.Mods, mods: glfw.Mods,
) void { ) void {
_ = mods;
const tracy = trace(@src()); const tracy = trace(@src());
defer tracy.end(); defer tracy.end();

2
vendor/mach vendored

@ -1 +1 @@
Subproject commit 0d5b85344376ac22440680c696fc42b2e3614972 Subproject commit 9676665ccf332f5aee6b8ff92200c95212cc9c32