Skip to content

Commit 7a4ed4f

Browse files
Merge branch '0_14_0'
2 parents 73338d2 + f2d10fe commit 7a4ed4f

12 files changed

Lines changed: 16 additions & 21 deletions

File tree

build.zig

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pub fn addAssetsOption(b: *std.Build, exe:anytype, assetpath:[]const u8) !void {
99
var files = std.ArrayList([]const u8).init(b.allocator);
1010
defer files.deinit();
1111

12-
var buf: [std.fs.MAX_PATH_BYTES]u8 = undefined;
12+
var buf: [std.fs.max_path_bytes]u8 = undefined;
1313
const path = try std.fs.cwd().realpath(assetpath, buf[0..]);
1414

1515
var dir = try std.fs.openDirAbsolute(path, .{.iterate=true});
@@ -24,7 +24,7 @@ pub fn addAssetsOption(b: *std.Build, exe:anytype, assetpath:[]const u8) !void {
2424
exe.step.dependOn(&options.step);
2525

2626
const assets = b.addModule("assets", .{
27-
.root_source_file = options.getSource(),
27+
.root_source_file = options.getOutput(),
2828
.target = target,
2929
.optimize = optimize,
3030
});
@@ -109,9 +109,11 @@ fn addExample(b: *std.Build, comptime name: []const u8, flags: ?[]const []const
109109
pub fn build(b: *std.Build) !void {
110110
const hosttarget = b.standardTargetOptions(.{});
111111
optimize = b.standardOptimizeOption(.{});
112-
target = b.resolveTargetQuery(std.zig.CrossTarget.parse(
113-
.{ .arch_os_abi = "wasm32-freestanding" },
114-
) catch unreachable);
112+
113+
target = b.resolveTargetQuery(.{
114+
.cpu_arch = .wasm32,
115+
.os_tag = .freestanding,
116+
});
115117

116118
b.installFile("src/index.html", "index.html");
117119
b.installFile("src/pcm-processor.js", "pcm-processor.js");

build.zig.zon

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@
3636
.hash = "12202a7c100a234ad042d4e1eda738e04652a1b20ddc50aed529954702198fa09f42",
3737
},
3838
.mibu = .{
39-
.url = "git+https://github.com/xyaman/mibu.git#5cbda43f41f4d1f2769dd32523d8c1b474a4c60f",
40-
.hash = "12205e93ed17ab3081a9d5289c2665e67873501f069a6210e02f3d8178a0c6e3156a",
39+
.url = "git+https://github.com/xyaman/mibu.git#b001662c929e2719ee24be585a3120640f946337",
40+
.hash = "1220d78664322b50e31a99cfb004b6fa60c43098d95abf7ec60a21ebeaf1c914edaf",
4141
},
4242
.zigtris = .{
43-
.url = "git+https://github.com/ringtailsoftware/zigtris.git#3fe5309a45ec0877ab108f6d3144cc84e93c4420",
44-
.hash = "1220efba806754c7047c8d6058878b8623fa49890db25edbb2129e461cdd0d016034",
43+
.url = "git+https://github.com/ringtailsoftware/zigtris.git#7563ff5421974857ee8e745f7ae020874f2954af",
44+
.hash = "122062266e1f9482cd9601be6ecb8cacc91cc8c9a912e3a8c4e48a69827869dc17ec",
4545
},
4646
},
4747
.paths = .{

src/agnes/agnes.zig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ fn consoleWriteFn(data:[]const u8) void {
6161
pub fn panic(msg: []const u8, trace: ?*std.builtin.StackTrace, ret_addr: ?usize) noreturn {
6262
_ = ret_addr;
6363
_ = trace;
64-
@setCold(true);
6564
_ = console.print("PANIC: {s}", .{msg}) catch 0;
6665
while (true) {}
6766
}

src/bat/bat.zig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ pub const std_options: std.Options = .{
8484
pub fn panic(msg: []const u8, trace: ?*std.builtin.StackTrace, ret_addr: ?usize) noreturn {
8585
_ = ret_addr;
8686
_ = trace;
87-
@setCold(true);
8887
_ = console.print("PANIC: {s}", .{msg}) catch 0;
8988
while (true) {}
9089
}

src/doom/doom.zig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ pub const std_options: std.Options = .{
6161
};
6262

6363
pub fn panic(msg: []const u8, trace: ?*std.builtin.StackTrace, ret_addr: ?usize) noreturn {
64-
@setCold(true);
6564
_ = console.print("PANIC: {s} ret_addr={any}\n", .{msg, ret_addr}) catch 0;
6665
_ = console.print("{any}\n", .{trace}) catch 0;
6766
while (true) {}

src/mandelbrot/mandelbrot.zig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ pub const std_options: std.Options = .{
3434
pub fn panic(msg: []const u8, trace: ?*std.builtin.StackTrace, ret_addr: ?usize) noreturn {
3535
_ = ret_addr;
3636
_ = trace;
37-
@setCold(true);
3837
_ = console.print("PANIC: {s}", .{msg}) catch 0;
3938
//while (true) {}
4039
unreachable;

src/olive/olive.zig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ var mix_right: [RENDER_QUANTUM_FRAMES]f32 = undefined;
1616

1717
var startTime: u32 = 0;
1818

19-
var prng = std.rand.DefaultPrng.init(0);
19+
var prng = std.Random.DefaultPrng.init(0);
2020
var rand = prng.random();
2121

2222
const NUMBALLS = 1000;
@@ -79,7 +79,6 @@ pub const std_options: std.Options = .{
7979
pub fn panic(msg: []const u8, trace: ?*std.builtin.StackTrace, ret_addr: ?usize) noreturn {
8080
_ = ret_addr;
8181
_ = trace;
82-
@setCold(true);
8382
_ = console.print("PANIC: {s}", .{msg}) catch 0;
8483
while (true) {}
8584
}

src/olive/zlm-generic.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pub fn SpecializeOn(comptime Real: type) type {
3131
/// adds all components from `a` with the components of `b`.
3232
pub fn add(a: Self, b: Self) Self {
3333
var result: Self = undefined;
34-
inline for (@typeInfo(Self).Struct.fields) |fld| {
34+
inline for (@typeInfo(Self).@"struct".fields) |fld| {
3535
@field(result, fld.name) = @field(a, fld.name) + @field(b, fld.name);
3636
}
3737
return result;

src/terminal/assets.zig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ const std = @import("std");
22
const assets = @import("assets");
33

44
const EmbeddedAsset = struct {
5-
[]const u8 = undefined,
6-
[]const u8 = undefined,
5+
[]const u8,
6+
[]const u8,
77
};
88

99
pub const Assets = struct {

src/terminal/terminal.zig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ pub const std_options: std.Options = .{
6464
pub fn panic(msg: []const u8, trace: ?*std.builtin.StackTrace, ret_addr: ?usize) noreturn {
6565
_ = ret_addr;
6666
_ = trace;
67-
@setCold(true);
6867
_ = console.print("PANIC: {s}", .{msg}) catch 0;
6968
while (true) {}
7069
}

0 commit comments

Comments
 (0)