From fa46be8ea2381289aec32ca651b6a44fb5289aaa Mon Sep 17 00:00:00 2001 From: Matt Knight Date: Fri, 23 Sep 2022 00:16:01 -0700 Subject: [PATCH] Revert "Revert "Add executable method (addOptions, addObjectFile) and fix recursive call in addIncludePath (#79)" (#81)" (#82) This reverts commit 4cc682cece7b4217261fec59d9c199a83ff8f90c. --- src/main.zig | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main.zig b/src/main.zig index 0f65b62..c4fa6e5 100644 --- a/src/main.zig +++ b/src/main.zig @@ -69,7 +69,7 @@ pub const EmbeddedExecutable = struct { } pub fn addIncludePath(exe: *EmbeddedExecutable, path: []const u8) void { - exe.addIncludePath(path); + exe.inner.addIncludePath(path); } pub fn addSystemIncludePath(exe: *EmbeddedExecutable, path: []const u8) void { @@ -79,6 +79,15 @@ pub const EmbeddedExecutable = struct { pub fn addCSourceFile(exe: *EmbeddedExecutable, file: []const u8, flags: []const []const u8) void { exe.inner.addCSourceFile(file, flags); } + + pub fn addOptions(exe: *EmbeddedExecutable, package_name: []const u8, options: *std.build.OptionsStep) void { + exe.inner.addOptions(package_name, options); + exe.addPackage(.{ .name = package_name, .source = options.getSource() }); + } + + pub fn addObjectFile(exe: *EmbeddedExecutable, source_file: []const u8) void { + exe.inner.addObjectFile(source_file); + } }; pub fn addEmbeddedExecutable(