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

Merge pull request #142 from mitchellh/fix-build

Browse Source 
Fix build, upstream vendor changes
This commit is contained in:
Mitchell Hashimoto
2023-04-06 09:04:45 -07:00
committed by GitHub
parent 920200fa04 1bfefa967c
commit 9c990dd685
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@ -1,6 +1,3 @@
[submodule "vendor/mach"]
path = vendor/mach
url = https://github.com/hexops/mach.git
[submodule "vendor/freetype"] [submodule "vendor/freetype"]
path = vendor/freetype path = vendor/freetype
url = https://github.com/freetype/freetype.git url = https://github.com/freetype/freetype.git
@ -43,3 +40,6 @@
[submodule "vendor/mach-sdk/sdk-linux-x86_64"] [submodule "vendor/mach-sdk/sdk-linux-x86_64"]
path = vendor/mach-sdk/sdk-linux-x86_64 path = vendor/mach-sdk/sdk-linux-x86_64
url = https://github.com/hexops/sdk-linux-x86_64.git url = https://github.com/hexops/sdk-linux-x86_64.git
[submodule "vendor/mach-glfw"]
path = vendor/mach-glfw
url = https://github.com/hexops/mach-glfw.git

4
build.zig
View File

@ -4,7 +4,7 @@ const fs = std.fs;
const LibExeObjStep = std.build.LibExeObjStep; const LibExeObjStep = std.build.LibExeObjStep;
const RunStep = std.build.RunStep; const RunStep = std.build.RunStep;
const apprt = @import("src/apprt.zig"); const apprt = @import("src/apprt.zig");
const glfw = @import("vendor/mach/libs/glfw/build.zig"); const glfw = @import("vendor/mach-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");
@ -20,7 +20,7 @@ const stb_image_resize = @import("pkg/stb_image_resize/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/libs/glfw/system_sdk.zig"); const system_sdk = @import("vendor/mach-glfw/system_sdk.zig");
const font = @import("src/font/main.zig"); const font = @import("src/font/main.zig");
const WasmTarget = @import("src/os/wasm/target.zig").Target; const WasmTarget = @import("src/os/wasm/target.zig").Target;
const LibtoolStep = @import("src/build/LibtoolStep.zig"); const LibtoolStep = @import("src/build/LibtoolStep.zig");

1
vendor/mach vendored

@ -1 +0,0 @@
Subproject commit 60597f78d8057d134fc92eed8b7762bb27a74fbf

1
vendor/mach-glfw vendored Submodule

@ -0,0 +1 @@
Subproject commit 871de9334926273b41c80b0fb13a74d8438eb4e7

2
vendor/zig-objc vendored

@ -1 +1 @@
Subproject commit fa7be5173c9bd6708b4a436be7f77f8e3e6bd43b Subproject commit 1e3537ab97144c5c0fe0979c12c92121912a5e89