From e19751d91afe8ca9673069ce7135bccfa36ec7b7 Mon Sep 17 00:00:00 2001
From: Stephen Gutekanst <stephen@hexops.com>
Date: Sat, 10 Jul 2021 01:54:16 -0700
Subject: [PATCH] glfw: tidy up Options struct

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
---
 glfw/build.zig | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/glfw/build.zig b/glfw/build.zig
index ff8a1aa7..af40aabc 100644
--- a/glfw/build.zig
+++ b/glfw/build.zig
@@ -14,15 +14,26 @@ pub fn build(b: *Builder) void {
     test_step.dependOn(&main_tests.step);
 }
 
-fn thisDir() []const u8 {
-    return std.fs.path.dirname(@src().file) orelse ".";
-}
+pub const LinuxWindowManager = enum {
+    X11,
+    Wayland,
+};
 
 pub const Options = struct {
-    Vulkan: bool = true,
-    Metal: bool = true,
-    OpenGL: bool = false,
-    GLES: bool = false,
+    // Not supported on macOS.
+    vulkan: bool = true,
+
+    // Only respected on macOS.
+    metal: bool = true,
+
+    // Deprecated on macOS.
+    opengl: bool = false,
+
+    // Not supported on macOS.
+    gles: bool = false,
+
+    // Only respected on Linux.
+    linux_window_manager: LinuxWindowManager = .X11, 
 };
 
 pub fn link(b: *Builder, step: *std.build.LibExeObjStep, options: Options) void {
@@ -116,6 +127,10 @@ pub fn link(b: *Builder, step: *std.build.LibExeObjStep, options: Options) void
     linkGLFW(b, step, options);
 }
 
+fn thisDir() []const u8 {
+    return std.fs.path.dirname(@src().file) orelse ".";
+}
+
 fn linkGLFW(b: *Builder, step: *std.build.LibExeObjStep, options: Options) void {
     var include_dir = std.fs.path.join(b.allocator, &.{ thisDir(), "upstream/glfw/include" }) catch unreachable;
     defer b.allocator.free(include_dir);
@@ -141,7 +156,7 @@ fn linkGLFW(b: *Builder, step: *std.build.LibExeObjStep, options: Options) void
             step.linkFramework("Cocoa");
             step.linkFramework("IOKit");
             step.linkFramework("CoreFoundation");
-            if (options.OpenGL) {
+            if (options.opengl) {
                 step.linkFramework("OpenGL");
             }
         },