hamcha/elphin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update for zig 0.13.0

Browse source
This commit is contained in:
Hamcha 2024-06-07 15:56:28 +02:00
parent b7c527394d
commit f706fe6053
Signed by: hamcha
GPG key ID: 1669C533B8CF6D89
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,4 +1,5 @@
zig-cache zig-cache
.zig-cache
zig-out zig-out
*.elf *.elf
*.dol *.dol

2
build.zig
View file

@ -42,7 +42,7 @@ pub fn build(b: *std.Build) void {
/// Module function for depending on the elphin module /// Module function for depending on the elphin module
pub fn addModule(b: *std.Build) void { pub fn addModule(b: *std.Build) void {
_ = b.addModule("elphin", .{ _ = b.addModule("elphin", .{
.root_source_file = .{ .path = "src/lib.zig" }, .root_source_file = b.path("src/lib.zig"),
}); });
} }

2
example-ci/build.zig
View file

@ -2,7 +2,7 @@ const std = @import("std");
const elphin = @import("elphin"); const elphin = @import("elphin");
pub fn build(b: *std.Build) void { pub fn build(b: *std.Build) void {
const file = b.addInstallBinFile(.{ .path = "../testdata/example.elf" }, "lol.elf"); const file = b.addInstallBinFile(b.path("../testdata/example.elf"), "lol.elf");
b.getInstallStep().dependOn(&file.step); b.getInstallStep().dependOn(&file.step);
const convert = elphin.convertInstalled(b, "lol.elf", .{}); const convert = elphin.convertInstalled(b, "lol.elf", .{});

4
src/buildlib.zig
View file

@ -22,7 +22,7 @@ pub fn convertExecutable(b: *std.Build, artifact: *std.Build.Step.Compile, optio
pub fn convertInstalled(b: *std.Build, path: []const u8, options: ConvertFileOptions) *Self { pub fn convertInstalled(b: *std.Build, path: []const u8, options: ConvertFileOptions) *Self {
const inputPath = b.getInstallPath(options.installDir, path); const inputPath = b.getInstallPath(options.installDir, path);
return convertFile(b, .{ .path = inputPath }, options); return convertFile(b, .{ .cwd_relative = inputPath }, options);
} }
fn convertFile(b: *std.Build, file: std.Build.LazyPath, options: ConvertFileOptions) *Self { fn convertFile(b: *std.Build, file: std.Build.LazyPath, options: ConvertFileOptions) *Self {
@ -41,7 +41,7 @@ fn convertFile(b: *std.Build, file: std.Build.LazyPath, options: ConvertFileOpti
return self; return self;
} }
fn make(step: *std.Build.Step, _: *std.Progress.Node) !void { fn make(step: *std.Build.Step, _: std.Progress.Node) !void {
const self: *Self = @fieldParentPtr("step", step); const self: *Self = @fieldParentPtr("step", step);
const b = step.owner; const b = step.owner;