[Breaking] Upgrade to Zig 0.15.1

Author: hazeycode

build.zig

@@ -4,21 +4,11 @@ pub fn build(b: *std.Build) void {
     const optimize = b.standardOptimizeOption(.{});
     const target = b.standardTargetOptions(.{});
 
-    _ = b.addModule("root", .{
+    const module = b.addModule("root", .{
         .root_source_file = b.path("src/zbullet.zig"),
-    });
-
-    const cbullet = b.addStaticLibrary(.{
-        .name = "cbullet",
         .target = target,
         .optimize = optimize,
     });
-    b.installArtifact(cbullet);
-
-    cbullet.addIncludePath(b.path("libs/cbullet"));
-    cbullet.addIncludePath(b.path("libs/bullet"));
-    cbullet.linkLibC();
-    cbullet.linkLibCpp();
 
     // TODO: Use the old damping method for now otherwise there is a hang in powf().
     const flags = &.{
@@ -27,7 +17,7 @@ pub fn build(b: *std.Build) void {
         "-std=c++11",
         "-fno-sanitize=undefined",
     };
-    cbullet.addCSourceFiles(.{
+    module.addCSourceFiles(.{
         .files = &.{
             "libs/cbullet/cbullet.cpp",
             "libs/bullet/btLinearMathAll.cpp",
@@ -36,22 +26,29 @@ pub fn build(b: *std.Build) void {
         },
         .flags = flags,
     });
+    module.addIncludePath(b.path("libs/cbullet"));
+    module.addIncludePath(b.path("libs/bullet"));
+
+    const cbullet_lib = b.addLibrary(.{
+        .name = "cbullet",
+        .root_module = module,
+    });
+    b.installArtifact(cbullet_lib);
+
+    cbullet_lib.linkLibC();
+    cbullet_lib.linkLibCpp();
 
     const test_step = b.step("test", "Run zbullet tests");
 
     const zmath = b.dependency("zmath", .{});
 
     var tests = b.addTest(.{
         .name = "zbullet-tests",
-        .root_source_file = b.path("src/zbullet.zig"),
-        .target = target,
-        .optimize = optimize,
+        .root_module = module,
     });
     b.installArtifact(tests);
 
     tests.root_module.addImport("zmath", zmath.module("root"));
 
-    tests.linkLibrary(cbullet);
-
     test_step.dependOn(&b.addRunArtifact(tests).step);
 }

build.zig.zon

@@ -2,7 +2,7 @@
     .name = .zbullet,
     .fingerprint = 0xdea5c1cd8f1709ee, // Changing this has security and trust implications.
     .version = "0.4.0-dev",
-    .minimum_zig_version = "0.14.0",
+    .minimum_zig_version = "0.15.1",
     .paths = .{
         "build.zig",
         "build.zig.zon",
@@ -13,8 +13,8 @@
     .dependencies = .{
         // Used by tests
         .zmath = .{
-            .url = "git+https://github.com/zig-gamedev/zmath#ccf7297ef6c01e21b2d51ad81b5b6ce929e86a00",
-            .hash = "zmath-0.11.0-dev-wjwivZY1AwDO7yxNmZ5HWoU03f9mFBet8LN9-oYc3i29",
+            .url = "https://github.com/zig-gamedev/zmath/archive/3a5955b2b72cd081563fbb084eff05bffd1e3fbb.tar.gz",
+            .hash = "zmath-0.11.0-dev-wjwivdMsAwD-xaLj76YHUq3t9JDH-X16xuMTmnDzqbu2",
         },
     },
 }

src/zbullet.zig

@@ -18,8 +18,8 @@ pub const Body = *align(@sizeOf(usize)) BodyImpl;
 pub const Constraint = *align(@sizeOf(usize)) ConstraintImpl;
 pub const Point2PointConstraint = *align(@sizeOf(usize)) Point2PointConstraintImpl;
 
-pub const AllocFn = *const fn (size: usize, alignment: i32) callconv(.C) ?*anyopaque;
-pub const FreeFn = *const fn (ptr: ?*anyopaque) callconv(.C) void;
+pub const AllocFn = *const fn (size: usize, alignment: i32) callconv(.c) ?*anyopaque;
+pub const FreeFn = *const fn (ptr: ?*anyopaque) callconv(.c) void;
 
 extern fn cbtAlignedAllocSetCustomAligned(
     alloc: ?AllocFn,
@@ -34,7 +34,7 @@ var mem_allocator: ?std.mem.Allocator = null;
 var mem_allocations: ?std.AutoHashMap(usize, SizeAndAlignment) = null;
 var mem_mutex: std.Thread.Mutex = .{};
 
-export fn zbulletAlloc(size: usize, alignment: i32) callconv(.C) ?*anyopaque {
+export fn zbulletAlloc(size: usize, alignment: i32) callconv(.c) ?*anyopaque {
     mem_mutex.lock();
     defer mem_mutex.unlock();
 
@@ -53,7 +53,7 @@ export fn zbulletAlloc(size: usize, alignment: i32) callconv(.C) ?*anyopaque {
     return ptr;
 }
 
-export fn zbulletFree(maybe_ptr: ?*anyopaque) callconv(.C) void {
+export fn zbulletFree(maybe_ptr: ?*anyopaque) callconv(.c) void {
     if (maybe_ptr) |ptr| {
         mem_mutex.lock();
         defer mem_mutex.unlock();
@@ -1156,23 +1156,23 @@ pub const DebugDraw = extern struct {
         *const [3]f32,
         *const [3]f32,
         *const [3]f32,
-    ) callconv(.C) void;
+    ) callconv(.c) void;
 
     const DrawLine2Fn = *const fn (
         ?*anyopaque,
         *const [3]f32,
         *const [3]f32,
         *const [3]f32,
         *const [3]f32,
-    ) callconv(.C) void;
+    ) callconv(.c) void;
 
     const DrawContactPointFn = *const fn (
         ?*anyopaque,
         *const [3]f32,
         *const [3]f32,
         f32,
         *const [3]f32,
-    ) callconv(.C) void;
+    ) callconv(.c) void;
 
     drawLine1: DrawLine1Fn,
     drawLine2: ?DrawLine2Fn,
@@ -1188,12 +1188,12 @@ pub const DebugDrawer = struct {
         color: u32,
     };
 
-    pub fn init(alloc: std.mem.Allocator) DebugDrawer {
-        return .{ .lines = std.ArrayList(Vertex).init(alloc) };
+    pub fn init() DebugDrawer {
+        return .{ .lines = std.ArrayList(Vertex){} };
     }
 
     pub fn deinit(debug: *DebugDrawer) void {
-        debug.lines.deinit();
+        debug.lines.deinit(mem_allocator.?);
         debug.* = undefined;
     }
 
@@ -1211,7 +1211,7 @@ pub const DebugDrawer = struct {
         p0: *const [3]f32,
         p1: *const [3]f32,
         color: *const [3]f32,
-    ) callconv(.C) void {
+    ) callconv(.c) void {
         const debug = @as(
             *DebugDrawer,
             @ptrCast(@alignCast(context.?)),
@@ -1223,9 +1223,11 @@ pub const DebugDrawer = struct {
         const rgb = r | g | b;
 
         debug.lines.append(
+            mem_allocator.?,
             .{ .position = .{ p0[0], p0[1], p0[2] }, .color = rgb },
         ) catch unreachable;
         debug.lines.append(
+            mem_allocator.?,
             .{ .position = .{ p1[0], p1[1], p1[2] }, .color = rgb },
         ) catch unreachable;
     }
@@ -1236,7 +1238,7 @@ pub const DebugDrawer = struct {
         p1: *const [3]f32,
         color0: *const [3]f32,
         color1: *const [3]f32,
-    ) callconv(.C) void {
+    ) callconv(.c) void {
         const debug = @as(
             *DebugDrawer,
             @ptrCast(@alignCast(context.?)),
@@ -1253,9 +1255,11 @@ pub const DebugDrawer = struct {
         const rgb1 = r1 | g1 | b1;
 
         debug.lines.append(
+            mem_allocator.?,
             .{ .position = .{ p0[0], p0[1], p0[2] }, .color = rgb0 },
         ) catch unreachable;
         debug.lines.append(
+            mem_allocator.?,
             .{ .position = .{ p1[0], p1[1], p1[2] }, .color = rgb1 },
         ) catch unreachable;
     }