From d7be41e35f9f26404c700a0955035c1e010fe36f Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Fri, 5 Nov 2021 04:20:09 -0700 Subject: [PATCH] webgpu: add libs/mach-glfw Signed-off-by: Stephen Gutekanst --- webgpu/build.zig | 4 ++-- webgpu/build_dawn.zig | 5 ++--- webgpu/libs/mach-glfw | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) create mode 120000 webgpu/libs/mach-glfw diff --git a/webgpu/build.zig b/webgpu/build.zig index 2b015480..6ca16f67 100644 --- a/webgpu/build.zig +++ b/webgpu/build.zig @@ -1,7 +1,7 @@ const Builder = @import("std").build.Builder; const dawn = @import("build_dawn.zig"); -const glfw = @import("./libs/dawn/mach-old/glfw/build.zig"); // TODO: mach-old path +const glfw = @import("libs/mach-glfw/build.zig"); pub fn build(b: *Builder) void { const mode = b.standardReleaseOptions(); @@ -24,7 +24,7 @@ pub fn build(b: *Builder) void { dawn_example.setTarget(target); dawn.link(b, dawn_example, .{}); glfw.link(b, dawn_example, .{.system_sdk = .{.set_sysroot = false}}); - dawn_example.addPackagePath("glfw", "./libs/dawn/mach-old/glfw/src/main.zig"); // TODO: mach-old path + dawn_example.addPackagePath("glfw", "libs/mach-glfw/src/main.zig"); dawn_example.addIncludeDir("libs/dawn/out/Debug/gen/src/include"); dawn_example.addIncludeDir("libs/dawn/out/Debug/gen/src"); dawn_example.addIncludeDir("libs/dawn/src/include"); diff --git a/webgpu/build_dawn.zig b/webgpu/build_dawn.zig index 817b03e4..efe56fd1 100644 --- a/webgpu/build_dawn.zig +++ b/webgpu/build_dawn.zig @@ -1,7 +1,6 @@ const std = @import("std"); const Builder = std.build.Builder; -//const glfw = @import("../glfw/build.zig"); -const glfw = @import("./libs/dawn/mach-old/glfw/build.zig"); // TODO: mach-old path +const glfw = @import("libs/mach-glfw/build.zig"); pub fn build(b: *Builder) void { const mode = b.standardReleaseOptions(); @@ -18,7 +17,7 @@ pub fn build(b: *Builder) void { example.setTarget(target); link(b, example, .{}); glfw.link(b, example, .{.system_sdk = .{.set_sysroot = false}}); - example.addPackagePath("glfw", "./libs/dawn/mach-old/glfw/src/main.zig"); // TODO: mach-old path + example.addPackagePath("glfw", "libs/mach-glfw/src/main.zig"); example.addIncludeDir("out/Debug/gen/src/include"); example.addIncludeDir("out/Debug/gen/src"); example.addIncludeDir("examples"); diff --git a/webgpu/libs/mach-glfw b/webgpu/libs/mach-glfw new file mode 120000 index 00000000..0d47f286 --- /dev/null +++ b/webgpu/libs/mach-glfw @@ -0,0 +1 @@ +../../glfw \ No newline at end of file