From 1a9e4cdbc3c2cfdd3ecfef1df447d67283f1f7b5 Mon Sep 17 00:00:00 2001 From: Matt Knight Date: Tue, 28 Feb 2023 01:26:24 -0800 Subject: [PATCH] Update microzig (#4) * update microzig * update to new api --------- Co-authored-by: mattnite --- build.zig | 35 +++++++++++++++++++---------------- deps/microzig | 2 +- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/build.zig b/build.zig index 30cd9c9..86ad216 100644 --- a/build.zig +++ b/build.zig @@ -1,7 +1,8 @@ const std = @import("std"); const microzig = @import("deps/microzig/build.zig"); -const boards = @import("src/boards.zig"); -const chips = @import("src/chips.zig"); + +pub const boards = @import("src/boards.zig"); +pub const chips = @import("src/chips.zig"); pub fn build(b: *std.build.Builder) void { const optimize = b.standardOptimizeOption(.{}); @@ -9,13 +10,14 @@ pub fn build(b: *std.build.Builder) void { if (!decl.is_pub) continue; - const exe = microzig.addEmbeddedExecutable( - b, - @field(boards, decl.name).name ++ ".minimal", - "test/programs/minimal.zig", - .{ .board = @field(boards, decl.name) }, - .{ .optimize = optimize }, - ); + const exe = microzig.addEmbeddedExecutable(b, .{ + .name = @field(boards, decl.name).name ++ ".minimal", + .source_file = .{ + .path = "test/programs/minimal.zig", + }, + .backing = .{ .board = @field(boards, decl.name) }, + .optimize = optimize, + }); exe.install(); } @@ -23,13 +25,14 @@ pub fn build(b: *std.build.Builder) void { if (!decl.is_pub) continue; - const exe = microzig.addEmbeddedExecutable( - b, - @field(chips, decl.name).name ++ ".minimal", - "test/programs/minimal.zig", - .{ .chip = @field(chips, decl.name) }, - .{ .optimize = optimize }, - ); + const exe = microzig.addEmbeddedExecutable(b, .{ + .name = @field(chips, decl.name).name ++ ".minimal", + .source_file = .{ + .path = "test/programs/minimal.zig", + }, + .backing = .{ .chip = @field(chips, decl.name) }, + .optimize = optimize, + }); exe.install(); } } diff --git a/deps/microzig b/deps/microzig index 11214ed..b6fc3ab 160000 --- a/deps/microzig +++ b/deps/microzig @@ -1 +1 @@ -Subproject commit 11214ed8ba05e380a516beef3f3f594571a1c732 +Subproject commit b6fc3abbf7a91cb0cdafc7843ac7e6c26042ff84