Update to Zig 0.12.0-dev.2236+32e88251e

Author: fabioarnold

build.zig

@@ -17,31 +17,32 @@ pub fn build(b: *std.Build) !void {
     const zigwin32_dep = b.dependency("zigwin32", .{});
     const nanovg_dep = b.dependency("nanovg", .{ .target = target, .optimize = optimize });
 
-    // const nanovg = b.createModule(.{ .source_file = .{ .path = "deps/nanovg-zig/src/nanovg.zig" } });
-    const nanovg = nanovg_dep.module("nanovg");
-    const gui = b.createModule(.{ .source_file = .{ .path = "src/gui/gui.zig" }, .dependencies = &.{.{ .name = "nanovg", .module = nanovg }} });
+    const nanovg_mod = nanovg_dep.module("nanovg");
+    const gui_mod = b.createModule(.{ .root_source_file = .{ .path = "src/gui/gui.zig" } });
+    gui_mod.addImport("nanovg", nanovg_mod);
+    const data_mod = b.createModule(.{ .root_source_file = .{ .path = "data/data.zig" } });
+
 
     const exe = b.addExecutable(.{
         .name = "minipixel",
         .root_source_file = .{ .path = "src/main.zig" },
-        .main_mod_path = .{ .path = "." },
         .target = target,
         .optimize = optimize,
     });
 
     const exe_options = b.addOptions();
-    exe.addOptions("build_options", exe_options);
+    exe.root_module.addOptions("build_options", exe_options);
     exe_options.addOption(bool, "automated_testing", automated_testing);
 
     exe.addIncludePath(.{ .path = "lib/gl2/include" });
-    if (exe.target.isWindows()) {
-        exe.addVcpkgPaths(.dynamic) catch @panic("vcpkg not installed");
-        if (exe.vcpkg_bin_path) |bin_path| {
-            for (&[_][]const u8{ "libpng16.dll", "zlib1.dll" }) |dll| {
-                const src_dll = try std.fs.path.join(b.allocator, &.{ bin_path, dll });
-                b.installBinFile(src_dll, dll);
-            }
-        }
+    if (target.result.os.tag == .windows) {
+        // exe.addVcpkgPaths(.dynamic) catch @panic("vcpkg not installed");
+        // if (exe.vcpkg_bin_path) |bin_path| {
+        //     for (&[_][]const u8{ "libpng16.dll", "zlib1.dll" }) |dll| {
+        //         const src_dll = try std.fs.path.join(b.allocator, &.{ bin_path, dll });
+        //         b.installBinFile(src_dll, dll);
+        //     }
+        // }
         exe.subsystem = .Windows;
         exe.linkSystemLibrary("shell32");
         std.fs.cwd().access("minipixel.o", .{}) catch {
@@ -50,7 +51,7 @@ pub fn build(b: *std.Build) !void {
             return error.FileNotFound;
         };
         exe.addObjectFile(.{ .path = "minipixel.o" }); // add icon
-    } else if (exe.target.isDarwin()) {
+    } else if (target.result.os.tag == .macos) {
         exe.addCSourceFile(.{ .file = .{ .path = "src/c/sdl_hacks.m" }, .flags = &.{} });
     }
     const c_flags: []const []const u8 = if (optimize == .Debug)
@@ -59,28 +60,27 @@ pub fn build(b: *std.Build) !void {
         &.{ "-std=c99", "-D_CRT_SECURE_NO_WARNINGS" };
     exe.addCSourceFile(.{ .file = .{ .path = "src/c/png_image.c" }, .flags = &.{"-std=c99"} });
     exe.addCSourceFile(.{ .file = .{ .path = "lib/gl2/src/glad.c" }, .flags = c_flags });
-    exe.addModule("win32", zigwin32_dep.module("zigwin32"));
-    exe.addModule("nfd", nfd_dep.module("nfd"));
-    exe.addModule("nanovg", nanovg);
-    exe.addModule("gui", gui);
-    exe.linkLibrary(nanovg_dep.artifact("nanovg"));
-    exe.linkLibrary(nfd_dep.artifact("nfd"));
+    exe.root_module.addImport("win32", zigwin32_dep.module("zigwin32"));
+    exe.root_module.addImport("nfd", nfd_dep.module("nfd"));
+    exe.root_module.addImport("nanovg", nanovg_mod);
+    exe.root_module.addImport("gui", gui_mod);
+    exe.root_module.addImport("data", data_mod);
     exe.linkLibrary(sdl_dep.artifact("SDL2"));
-    if (exe.target.isWindows()) {
+    if (target.result.os.tag == .windows) {
         // Workaround for CI: Zig detects pkg-config and resolves -lpng16 which doesn't exist
-        exe.linkSystemLibraryName("libpng16");
-    } else if (exe.target.isDarwin()) {
+        exe.linkSystemLibrary("libpng16");
+    } else if (target.result.os.tag == .macos) {
         exe.addIncludePath(.{ .path = "/opt/homebrew/include" });
         exe.addLibraryPath(.{ .path = "/opt/homebrew/lib" });
         exe.linkSystemLibrary("png");
     } else {
         exe.linkSystemLibrary("libpng16");
     }
-    if (exe.target.isDarwin()) {
+    if (target.result.os.tag == .macos) {
         exe.linkFramework("OpenGL");
-    } else if (exe.target.isWindows()) {
+    } else if (target.result.os.tag == .windows) {
         exe.linkSystemLibrary("opengl32");
-    } else if (exe.target.isLinux()) {
+    } else if (target.result.os.tag == .linux) {
         exe.linkSystemLibrary("gl");
         exe.linkSystemLibrary("X11");
     }

build.zig.zon

@@ -11,20 +11,20 @@
     },
     .dependencies = .{
         .nfd = .{
-            .url = "https://github.com/fabioarnold/nfd-zig/archive/4701d11cf52866828bd682c19ddddf60f8152960.tar.gz",
-            .hash = "12207996dc990674491c5cebe0c78026f8f99608a4cd5187bfeb0b3df910a04dc907",
+            .url = "https://github.com/fabioarnold/nfd-zig/archive/91b199d3cbb314c52c630b7bf6050c4d665c0628.tar.gz",
+            .hash = "122020466a938b490e0d4963eae2157d976990aa0acc53a1e32f9ac39d63a14cf977",
         },
         .sdl = .{
-            .url = "https://github.com/fabioarnold/SDL/archive/ea82c623a1321b81c64fc89c76579168b2ac835d.tar.gz",
-            .hash = "1220484b1a29fcae7fd69b66b0089827a424b3c1b217dd9848a70878df7182977ac2",
+            .url = "https://github.com/andrewrk/SDL/archive/db4a162db2f6f59f737d03f441455dc9524d5793.tar.gz",
+            .hash = "1220c5360c9c71c215baa41b46ec18d0711059b48416a2b1cf96c7c2d87b2e8e4cf6",
         },
         .zigwin32 = .{
             .url = "https://github.com/marlersoft/zigwin32/archive/6777f1db221d0cb50322842f558f03e3c3a4099f.tar.gz",
             .hash = "1220f8d5028adceac0c6fc8ef554d82efef49ca48913393e9c2f5d73a66b58c8aaad",
         },
         .nanovg = .{
-            .url = "https://github.com/fabioarnold/nanovg-zig/archive/de997980351481b6e1bbb6e1aceddde963d5e32b.tar.gz",
-            .hash = "1220b8d6ff0b689f46824fc9f4d179ced85b82c733c361ab69b6634a85bd88e88ba7",
+            .url = "https://github.com/fabioarnold/nanovg-zig/archive/b3396d4e65da5862c6ff088f64b3301aa50f3a9f.tar.gz",
+            .hash = "1220908cb7b3e907526744c1ab23d21d312a6062e3813dc1facc6f03980fdd3c04f6",
         },
     },
 }

data/data.zig

@@ -0,0 +1,13 @@
+pub const fonts = struct {
+    pub const roboto_regular = @embedFile("fonts/Roboto-Regular.ttf");
+    pub const roboto_bold = @embedFile("fonts/Roboto-Bold.ttf");
+};
+
+pub const images = struct {
+    pub const blendmodealpha = @embedFile("images/blendmodealpha.png");
+    pub const blendmodereplace = @embedFile("images/blendmodereplace.png");
+};
+
+pub const palettes = struct {
+    pub const arne16 = @embedFile("palettes/arne16.pal");
+};

data/blendmodealpha.png renamed to data/images/blendmodealpha.png

@@ -69,7 +69,7 @@ fn onMouseDown(widget: *gui.Widget, mouse_event: *gui.MouseEvent) void {
 }
 
 fn onMouseMove(widget: *gui.Widget, mouse_event: *gui.MouseEvent) void {
-    var self = @fieldParentPtr(Self, "widget", widget);
+    const self = @fieldParentPtr(Self, "widget", widget);
     _ = self;
     const link_itchio_rect = Rect(f32).make(
         link_itchio_bounds[0],

data/blendmodereplace.png renamed to data/images/blendmodereplace.png

@@ -3,13 +3,11 @@ const Allocator = std.mem.Allocator;
 
 const gui = @import("gui");
 const nvg = @import("nanovg");
+const data = @import("data");
 const Rect = gui.geometry.Rect;
 const Point = gui.geometry.Point;
 const BlendMode = @import("color.zig").BlendMode;
 
-const image_alpha_data = @embedFile("../data/blendmodealpha.png");
-const image_replace_data = @embedFile("../data/blendmodereplace.png");
-
 widget: gui.Widget,
 allocator: Allocator,
 
@@ -34,8 +32,8 @@ pub fn init(allocator: Allocator, rect: Rect(f32), vg: nvg) !*Self {
             Rect(f32).make(pad + 1, 33 - 27, rect.w - 2 * pad - 2, 27),
             Rect(f32).make(pad + 1, 33, rect.w - 2 * pad - 2, 27),
         },
-        .image_alpha = vg.createImageMem(image_alpha_data, .{ .nearest = true }),
-        .image_replace = vg.createImageMem(image_replace_data, .{ .nearest = true }),
+        .image_alpha = vg.createImageMem(data.images.blendmodealpha, .{ .nearest = true }),
+        .image_replace = vg.createImageMem(data.images.blendmodereplace, .{ .nearest = true }),
     };
 
     self.widget.onMouseDownFn = onMouseDown;

src/AboutDialogWidget.zig

@@ -62,7 +62,7 @@ pub fn setImage(allocator: std.mem.Allocator, image: Image) !void {
 
     if (c.EmptyClipboard() == 0) return error.EmptyClipboardFailed;
 
-    var png_data = try image.writeToMemory(allocator);
+    const png_data = try image.writeToMemory(allocator);
     defer allocator.free(png_data);
 
     // copy to global memory
@@ -73,7 +73,7 @@ pub fn setImage(allocator: std.mem.Allocator, image: Image) !void {
     if (c.GlobalLock(global_handle)) |local_mem| {
         defer _ = c.GlobalUnlock(global_handle);
         const data = @as([*]u8, @ptrCast(local_mem));
-        std.mem.copy(u8, data[0..png_data.len], png_data);
+        @memcpy(data[0..png_data.len], png_data);
 
         _ = c.SetClipboardData(png_format, global_handle);
     }

src/BlendModeWidget.zig

@@ -88,7 +88,7 @@ pub fn getRgba(self: Self, color_layer: ColorLayer) [4]u8 {
 pub fn setRgba(self: *Self, color_layer: ColorLayer, color: []const u8) void {
     const i = @intFromEnum(color_layer);
     if (!std.mem.eql(u8, &self.colors[i], color)) {
-        std.mem.copy(u8, &self.colors[i], color);
+        @memcpy(&self.colors[i], color);
         self.notifyChanged(.color);
     }
 }

src/ClipboardWin32.zig

@@ -3,6 +3,7 @@ const Allocator = std.mem.Allocator;
 
 const gui = @import("gui");
 const nvg = @import("nanovg");
+const data = @import("data");
 const Rect = gui.geometry.Rect;
 const col = @import("color.zig");
 
@@ -18,7 +19,7 @@ onSelectionChangedFn: ?*const fn (*Self) void = null,
 
 const Self = @This();
 
-const default_pal_contents = @embedFile("../data/palettes/arne16.pal");
+const default_pal_contents = data.palettes.arne16;
 
 pub fn init(allocator: Allocator, rect: Rect(f32)) !*Self {
     var self = try allocator.create(Self);
@@ -97,7 +98,7 @@ pub fn loadPalContents(self: *Self, contents: []const u8) !void {
         self.colors[4 * i + 3] = alpha;
     }
     while (i < 256) : (i += 1) {
-        std.mem.copy(u8, self.colors[4 * i ..][0..4], &col.black);
+        @memcpy(self.colors[4 * i ..][0..4], &col.black);
     }
 }