paoda
/
zba
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: update to Zig v0.11.0-dev.3299+34865d693

This commit is contained in:
Rekai Nyangadzayi Musuka 2023-05-25 15:41:48 -05:00
parent ccdc2cbad4
commit 3040a9f45c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -78,7 +78,7 @@ arm7wrestler GBA Fixed | [destoer](https://github.com/destoer)
## Compiling ## Compiling
Most recently built on Zig [v0.11.0-dev.2168+322ace70f](https://github.com/ziglang/zig/tree/322ace70f) Most recently built on Zig [v0.11.0-dev.3299+34865d693](https://github.com/ziglang/zig/tree/34865d693)
### Dependencies ### Dependencies

2
build.zig
View File

@ -8,7 +8,7 @@ const nfd = @import("lib/nfd-zig/build.zig");
pub fn build(b: *std.Build) void { pub fn build(b: *std.Build) void {
// Minimum Zig Version // Minimum Zig Version
const min_ver = std.SemanticVersion.parse("0.11.0-dev.2934+1b432072b") catch return; // https://github.com/ziglang/zig/commit/1b432072b const min_ver = std.SemanticVersion.parse("0.11.0-dev.3299+34865d693") catch return; // https://github.com/ziglang/zig/commit/34865d693
if (builtin.zig_version.order(min_ver).compare(.lt)) { if (builtin.zig_version.order(min_ver).compare(.lt)) {
std.log.err("{s}", .{b.fmt("Zig v{} does not meet the minimum version requirement. (Zig v{})", .{ builtin.zig_version, min_ver })}); std.log.err("{s}", .{b.fmt("Zig v{} does not meet the minimum version requirement. (Zig v{})", .{ builtin.zig_version, min_ver })});
std.os.exit(1); std.os.exit(1);

4
src/imgui.zig
View File

@ -241,7 +241,7 @@ pub fn draw(state: *State, win_dim: Dimensions, tex_id: GLuint, cpu: *Arm7tdmi)
var buf: @TypeOf(values) = undefined; var buf: @TypeOf(values) = undefined;
@memcpy(buf[0..len], values[0..len]); @memcpy(buf[0..len], values[0..len]);
std.sort.sort(u32, buf[0..len], {}, std.sort.asc(u32)); std.mem.sort(u32, buf[0..len], {}, std.sort.asc(u32));
break :blk buf; break :blk buf;
}; };
@ -300,7 +300,7 @@ pub fn draw(state: *State, win_dim: Dimensions, tex_id: GLuint, cpu: *Arm7tdmi)
const len = scheduler.queue.len; const len = scheduler.queue.len;
@memcpy(&items, scheduler.queue.items); @memcpy(&items, scheduler.queue.items);
std.sort.sort(Event, items[0..len], {}, widgets.eventDesc(Event)); std.mem.sort(Event, items[0..len], {}, widgets.eventDesc(Event));
for (items[0..len]) |event| { for (items[0..len]) |event| {
zgui.text("{X:0>16} | {?}", .{ event.tick, event.kind }); zgui.text("{X:0>16} | {?}", .{ event.tick, event.kind });