macos: merge local trackpad gestures with current upstream

1 files changed, 9 insertions, 1 deletions

diff --git a/build.zig b/build.zig
index 98ba2901..1e8547f4 100644
--- a/build.zig
+++ b/build.zig
@@ -718,6 +718,10 @@ pub fn build(b: *std.Build) void {
             }) |src|
                 link.addFileArg(b.path(b.fmt("src/macos/Sources/{s}", .{src})));
             link.addFileArg(lib_archive);
+            if (enable_quic) {
+                const ssl_libdir = std.mem.trim(u8, b.run(&.{ "pkg-config", "--variable=libdir", "openssl" }), " \t\r\n");
+                link.addArgs(&.{ "-L", ssl_libdir, "-lssl", "-lcrypto" });
+            }
             link.addArgs(&.{
                 "-lc++",
                 "-framework",
@@ -797,11 +801,15 @@ pub fn build(b: *std.Build) void {
                 "test/macos_e2e.swift",
             }) |source| e2e.addFileArg(b.path(source));
             e2e.addFileArg(lib_archive);
+            if (enable_quic) {
+                const ssl_libdir = std.mem.trim(u8, b.run(&.{ "pkg-config", "--variable=libdir", "openssl" }), " \t\r\n");
+                e2e.addArgs(&.{ "-L", ssl_libdir, "-lssl", "-lcrypto" });
+            }
             e2e.addArgs(&.{ "-lc++", "-framework", "AppKit", "-framework", "CoreText", "-framework", "CoreGraphics", "-framework", "CoreImage", "-framework", "Metal" });
             const files = b.addWriteFiles();
             const runnable = files.addCopyFile(e2e_bin, "pardes-macos-e2e");
             _ = files.addCopyFile(b.path("shaders/crt.ci.metal"), "crt.ci.metal");
-            const run_e2e = b.addSystemCommand(&.{});
+            const run_e2e = std.Build.Step.Run.create(b, "run macos-e2e");
             run_e2e.addFileArg(runnable);
             run_e2e.setCwd(b.path("."));
             if (b.args) |args| run_e2e.addArgs(args);