diff --git a/README.md b/README.md index 17b290b..adcdd13 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ arm7wrestler GBA Fixed | [destoer](https://github.com/destoer) ## Compiling -Most recently built on Zig [v0.11.0-dev.144+892fb0fc8](https://github.com/ziglang/zig/tree/892fb0fc8) +Most recently built on Zig [0.11.0-dev.368+1829b6eab](https://github.com/ziglang/zig/tree/1829b6eab) ### Dependencies diff --git a/src/core/bus/dma.zig b/src/core/bus/dma.zig index e00e623..407383a 100644 --- a/src/core/bus/dma.zig +++ b/src/core/bus/dma.zig @@ -5,7 +5,7 @@ const DmaControl = @import("io.zig").DmaControl; const Bus = @import("../Bus.zig"); const Arm7tdmi = @import("../cpu.zig").Arm7tdmi; -pub const DmaTuple = std.meta.Tuple(&[_]type{ DmaController(0), DmaController(1), DmaController(2), DmaController(3) }); +pub const DmaTuple = struct { DmaController(0), DmaController(1), DmaController(2), DmaController(3) }; const log = std.log.scoped(.DmaTransfer); const getHalf = util.getHalf; diff --git a/src/core/bus/timer.zig b/src/core/bus/timer.zig index d807659..ad7b5f0 100644 --- a/src/core/bus/timer.zig +++ b/src/core/bus/timer.zig @@ -5,7 +5,7 @@ const TimerControl = @import("io.zig").TimerControl; const Scheduler = @import("../scheduler.zig").Scheduler; const Arm7tdmi = @import("../cpu.zig").Arm7tdmi; -pub const TimerTuple = std.meta.Tuple(&[_]type{ Timer(0), Timer(1), Timer(2), Timer(3) }); +pub const TimerTuple = struct { Timer(0), Timer(1), Timer(2), Timer(3) }; const log = std.log.scoped(.Timer); const getHalf = util.getHalf; diff --git a/src/util.zig b/src/util.zig index 94a21c7..0042d9d 100644 --- a/src/util.zig +++ b/src/util.zig @@ -181,7 +181,7 @@ pub const Logger = struct { } }; -const FmtArgTuple = std.meta.Tuple(&.{ u32, u32, u32, u32, u32, u32, u32, u32, u32, u32, u32, u32, u32, u32, u32, u32, u32, u32 }); +const FmtArgTuple = struct { u32, u32, u32, u32, u32, u32, u32, u32, u32, u32, u32, u32, u32, u32, u32, u32, u32, u32 }; pub const audio = struct { const _io = @import("core/bus/io.zig");