Update to Zig 0.11.0

.gitignore

@@ -1,3 +1,4 @@
+c_wefx/
 zig-cache/
 zig-out/
 *.o

build.zig

@@ -1,22 +1,20 @@
 const std = @import("std");
 
 pub fn build(b: *std.build.Builder) void {
-    // Adds the option -Drelease=[bool] to create a release build, which by
-    // default we set to ReleaseSmall.
-    b.setPreferredReleaseMode(.ReleaseSmall);
-    // Standard release options allow the person running `zig build` to select
-    // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall.
-    const mode = b.standardReleaseOptions();
+    const wefx_module = b.addModule("WEFX", .{
+        .source_file = .{ .cwd_relative = "wefx/WEFX.zig" },
+    });
 
-    // EXAMPLES
-    const lib = b.addSharedLibrary("wefx", "examples/example1.zig", .unversioned);
-    lib.setBuildMode(mode);
-    lib.setTarget(.{
-        .cpu_arch = .wasm32,
-        .os_tag = .freestanding,
-        //.abi = .musl,
+    const lib = b.addSharedLibrary(.{
+        .name = "wefx-example",
+        .root_source_file = .{ .path = "examples/example1.zig" },
+        .target = .{
+            .cpu_arch = .wasm32,
+            .os_tag = .freestanding,
+        },
+        .optimize = .ReleaseSmall,
     });
-    lib.addPackagePath("WEFX", "./wefx/WEFX.zig");
-    lib.setOutputDir("./docs/");
-    lib.install();
+    lib.rdynamic = true;
+    lib.addModule("WEFX", wefx_module);
+    b.installArtifact(lib);
 }

docs/script.js

@@ -19,7 +19,7 @@ function getWASMGlobalValue(memory, global) {
 }
 
 async function bootstrap() {
-    const { instance } = await WebAssembly.instantiateStreaming(fetch("./wefx.wasm"));
+    const { instance } = await WebAssembly.instantiateStreaming(fetch("./wefx-example.wasm"));
 
     const memory = instance.exports.memory;
 

examples/example1.zig

@@ -47,19 +47,19 @@ fn draw(time: f32) void {
     const width = wefx.width;
     const height = wefx.height;
 
-    const x = @floatToInt(u32, time) % width;
-    wefx.point(x, (height / 2) + @floatToInt(u32, math.cos(time) * 2));
+    const x = @as(u32, @intFromFloat(time)) % width;
+    wefx.point(x, (height / 2) + @as(u32, @intFromFloat(math.cos(time) * 2)));
 
     var i: u32 = 0;
     while (i < 130) : (i += 1) {
         wefx.color(0xFF, 0, 0);
-        wefx.point(x - i, (height / 2) + @floatToInt(u32, math.sin(time - @intToFloat(f32, i)) * 3) - 20);
+        wefx.point(x - i, (height / 2) + @as(u32, @intFromFloat(math.sin(time - @as(f32, @floatFromInt(i))) * 3)) - 20);
 
         wefx.color(0, 0xFF, 0);
-        wefx.point(x - i, (height / 2) + @floatToInt(u32, math.cos(time - @intToFloat(f32, i)) * 2));
+        wefx.point(x - i, (height / 2) + @as(u32, @intFromFloat(math.cos(time - @as(f32, @floatFromInt(i))) * 2)));
 
         wefx.color(0, 0, 0xFF);
-        wefx.point(x - i, (height / 2) + @floatToInt(u32, math.sin(time - @intToFloat(f32, i)) * 3) + 20);
+        wefx.point(x - i, (height / 2) + @as(u32, @intFromFloat(math.sin(time - @as(f32, @floatFromInt(i))) * 3)) + 20);
     }
 
     wefx.color(0xFF, 0xFF, 0xFF);

wefx/WEFX.zig

@@ -240,7 +240,7 @@ pub fn circle(self: *Self, x0: u32, y0: u32, r0: u32) void {
 }
 
 pub fn flush(self: *Self) void {
-    for (self.buffer) |val, i| {
+    for (self.buffer, 0..) |val, i| {
         self.screen[i] = val;
     }
 }
@@ -294,7 +294,7 @@ export fn wefx_add_keyboard_event(
     timestamp: f32,
     key: u8,
 ) void {
-    const event_type = @intToEnum(EventType, event_type_val);
+    const event_type: EventType = @enumFromInt(event_type_val);
     const kbd_event = .{
         .key = key,
     };
@@ -311,13 +311,13 @@ export fn wefx_add_mouse_event(
     x: f32,
     y: f32,
 ) void {
-    const event_type = @intToEnum(EventType, event_type_val);
-    const button = @intToEnum(MouseEvent.Button, button_val);
+    const event_type: EventType = @enumFromInt(event_type_val);
+    const button: MouseEvent.Button = @enumFromInt(button_val);
 
     const mouse_event = .{
         .button = button,
-        .x = @floatToInt(u32, x),
-        .y = @floatToInt(u32, y),
+        .x = @as(u32, @intFromFloat(x)), // The @as(...) here shouldn't be necessary
+        .y = @as(u32, @intFromFloat(y)),
     };
     const event = Event.initMouseEvent(timestamp, event_type, mouse_event);
     // TODO: handle error on JS?
@@ -335,9 +335,9 @@ export fn wefx_add_mouse_event(
 //         @export(field_value, opts);
 //     }
 // }
-export var wefx_keydown = @enumToInt(EventType.keydown);
-export var wefx_keypress = @enumToInt(EventType.keypress);
-export var wefx_keyup = @enumToInt(EventType.keyup);
-export var wefx_mousemove = @enumToInt(EventType.mousemove);
-export var wefx_mousedown = @enumToInt(EventType.mousedown);
-export var wefx_mouseup = @enumToInt(EventType.mouseup);
+export var wefx_keydown: c_int = @intFromEnum(EventType.keydown);
+export var wefx_keypress: c_int = @intFromEnum(EventType.keypress);
+export var wefx_keyup: c_int = @intFromEnum(EventType.keyup);
+export var wefx_mousemove: c_int = @intFromEnum(EventType.mousemove);
+export var wefx_mousedown: c_int = @intFromEnum(EventType.mousedown);
+export var wefx_mouseup: c_int = @intFromEnum(EventType.mouseup);