mirror of
https://github.com/ghostty-org/ghostty.git
synced 2026-04-18 13:30:29 +00:00
Merge pull request #142 from mitchellh/fix-build
Fix build, upstream vendor changes
This commit is contained in:
6
.gitmodules
vendored
6
.gitmodules
vendored
@@ -1,6 +1,3 @@
|
||||
[submodule "vendor/mach"]
|
||||
path = vendor/mach
|
||||
url = https://github.com/hexops/mach.git
|
||||
[submodule "vendor/freetype"]
|
||||
path = vendor/freetype
|
||||
url = https://github.com/freetype/freetype.git
|
||||
@@ -43,3 +40,6 @@
|
||||
[submodule "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
|
||||
[submodule "vendor/mach-glfw"]
|
||||
path = vendor/mach-glfw
|
||||
url = https://github.com/hexops/mach-glfw.git
|
||||
|
||||
@@ -4,7 +4,7 @@ const fs = std.fs;
|
||||
const LibExeObjStep = std.build.LibExeObjStep;
|
||||
const RunStep = std.build.RunStep;
|
||||
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 freetype = @import("pkg/freetype/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 zlib = @import("pkg/zlib/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 WasmTarget = @import("src/os/wasm/target.zig").Target;
|
||||
const LibtoolStep = @import("src/build/LibtoolStep.zig");
|
||||
|
||||
1
vendor/mach
vendored
1
vendor/mach
vendored
Submodule vendor/mach deleted from 60597f78d8
1
vendor/mach-glfw
vendored
Submodule
1
vendor/mach-glfw
vendored
Submodule
Submodule vendor/mach-glfw added at 871de93349
2
vendor/zig-objc
vendored
2
vendor/zig-objc
vendored
Submodule vendor/zig-objc updated: fa7be5173c...1e3537ab97
Reference in New Issue
Block a user