Switch to zig 0.14

Author: Batres3

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Setup Zig
         run: |
           sudo apt install xz-utils
-          sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-x86_64-0.14.0-dev.1911+3bf89f55c.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
+          sudo sh -c 'wget -c https://ziglang.org/download/0.14.0/zig-linux-x86_64-0.14.0.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
       - name: build
         run: zig build
   x86_64-windows:
@@ -26,10 +26,10 @@ jobs:
       - name: Setup Zig
         run: |
           $ProgressPreference = 'SilentlyContinue'
-          Invoke-WebRequest -Uri "https://pkg.machengine.org/zig/zig-windows-x86_64-0.14.0-dev.1911+3bf89f55c.zip" -OutFile "C:\zig.zip"
+          Invoke-WebRequest -Uri "https://ziglang.org/download/0.14.0/zig-windows-x86_64-0.14.0.zip" -OutFile "C:\zig.zip"
           cd C:\
           7z x zig.zip
-          Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.14.0-dev.1911+3bf89f55c\"
+          Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.14.0\"
       - name: build
         run: zig build
   x86_64-macos:
@@ -42,7 +42,7 @@ jobs:
       - name: Setup Zig
         run: |
           brew install xz
-          sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-macos-x86_64-0.14.0-dev.1911+3bf89f55c.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
+          sudo sh -c 'wget -c https://ziglang.org/download/0.14.0/zig-macos-x86_64-0.14.0.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
       - name: build
         run: zig build
         env:

.github/workflows/ci.yml

@@ -1,4 +1,5 @@
 const std = @import("std");
+const Step = std.Build.Step;
 
 pub fn build(b: *std.Build) void {
     const target = b.standardTargetOptions(.{});
@@ -37,7 +38,9 @@ pub fn build(b: *std.Build) void {
         // To maintain the relative paths inside the files in src/
         lib.installHeadersDirectory(b.path("include/GLFW"), "include/GLFW", .{});
     }
-    // GLFW headers depend on these headers, so they must be distributed too.
+    //
+    // Header packaging for easy cross compilation
+    //
     if (b.lazyDependency("vulkan_headers", .{
         .target = target,
         .optimize = optimize,
@@ -60,7 +63,7 @@ pub fn build(b: *std.Build) void {
         }
     }
 
-    if (target.result.isDarwin()) {
+    if (target.result.os.tag.isDarwin()) {
         // MacOS: this must be defined for macOS 13.3 and older.
         lib.root_module.addCMacro("__kernel_ptr_semantics", "");
 
@@ -74,8 +77,12 @@ pub fn build(b: *std.Build) void {
         }
     }
 
-    const include_src_flag = "-Isrc";
-
+    //
+    // Source files
+    //
+    lib.addCSourceFiles(.{
+        .files = &base_sources,
+    });
     switch (target.result.os.tag) {
         .windows => {
             lib.linkSystemLibrary("gdi32");
@@ -90,14 +97,9 @@ pub fn build(b: *std.Build) void {
                 lib.linkSystemLibrary("GLESv3");
             }
 
-            const flags = [_][]const u8{ "-D_GLFW_WIN32", include_src_flag };
-            lib.addCSourceFiles(.{
-                .files = &base_sources,
-                .flags = &flags,
-            });
+            lib.root_module.addCMacro("_GLFW_WIN32", "1");
             lib.addCSourceFiles(.{
                 .files = &windows_sources,
-                .flags = &flags,
             });
         },
         .macos => {
@@ -126,44 +128,35 @@ pub fn build(b: *std.Build) void {
                 lib.linkFramework("OpenGL");
             }
 
-            const flags = [_][]const u8{ "-D_GLFW_COCOA", include_src_flag };
-            lib.addCSourceFiles(.{
-                .files = &base_sources,
-                .flags = &flags,
-            });
+            lib.root_module.addCMacro("_GLFW_COCOA", "1");
             lib.addCSourceFiles(.{
                 .files = &macos_sources,
-                .flags = &flags,
             });
         },
 
         // everything that isn't windows or mac is linux :P
         else => {
-            var sources = std.BoundedArray([]const u8, 64).init(0) catch unreachable;
-            var flags = std.BoundedArray([]const u8, 16).init(0) catch unreachable;
-
-            sources.appendSlice(&base_sources) catch unreachable;
-            sources.appendSlice(&linux_sources) catch unreachable;
+            lib.addCSourceFiles(.{
+                .files = &linux_sources,
+            });
 
             if (use_x11) {
-                sources.appendSlice(&linux_x11_sources) catch unreachable;
-                flags.append("-D_GLFW_X11") catch unreachable;
+                lib.root_module.addCMacro("_GLFW_X11", "1");
+                lib.addCSourceFiles(.{
+                    .files = &linux_x11_sources,
+                });
             }
 
             if (use_wl) {
-                lib.root_module.addCMacro("WL_MARSHAL_FLAG_DESTROY", "1");
-
-                sources.appendSlice(&linux_wl_sources) catch unreachable;
-                flags.append("-D_GLFW_WAYLAND") catch unreachable;
-                flags.append("-Wno-implicit-function-declaration") catch unreachable;
+                lib.root_module.addCMacro("_GLFW_WAYLAND", "1");
+
+                lib.addCSourceFiles(.{
+                    .files = &linux_wl_sources,
+                    .flags = &.{
+                        "-Wno-implicit-function-declaration",
+                    },
+                });
             }
-
-            flags.append(include_src_flag) catch unreachable;
-
-            lib.addCSourceFiles(.{
-                .files = sources.slice(),
-                .flags = flags.slice(),
-            });
         },
     }
     b.installArtifact(lib);

build.zig

@@ -1,6 +1,7 @@
 .{
-    .name = "glfw",
+    .name = .glfw,
     .version = "0.0.0",
+    .fingerprint = 0x3bbe0a5c521e9047,
     .paths = .{
         "include/",
         "src/",

build.zig.zon

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-git diff $(git merge-base master upstream/master)..master \
+git diff upstream/master \
     --diff-filter=d \
     ':(exclude)README.md' \
     ':(exclude)build.zig' \