zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

do not produce needless libraries (#220)

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2022-04-18 10:32:21 -07:00 • committed by GitHub
parent 7285fa0f03
commit d664c8e55d
Failed to generate hash of commit
2 changed files with 0 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

11
build.zig
View file

@ -84,17 +84,6 @@ pub fn link(b: *std.build.Builder, step: *std.build.LibExeObjStep, options: Opti
.gpu_dawn_options = @bitCast(@import("gpu/libs/mach-gpu-dawn/build.zig").Options, options.gpu_dawn_options), .gpu_dawn_options = @bitCast(@import("gpu/libs/mach-gpu-dawn/build.zig").Options, options.gpu_dawn_options),
}; };
const main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/main.zig" }) catch unreachable;
const lib = b.addStaticLibrary("mach", main_abs);
lib.setBuildMode(step.build_mode);
lib.setTarget(step.target);
lib.addPackage(gpu.pkg);
lib.addPackage(glfw.pkg);
glfw.link(b, lib, options.glfw_options);
gpu.link(b, lib, gpu_options);
lib.install();
glfw.link(b, step, options.glfw_options); glfw.link(b, step, options.glfw_options);
gpu.link(b, step, gpu_options); gpu.link(b, step, gpu_options);
} }

18
gpu/build.zig
View file

@ -10,12 +10,6 @@ pub fn build(b: *std.build.Builder) void {
.from_source = b.option(bool, "dawn-from-source", "Build Dawn from source") orelse false, .from_source = b.option(bool, "dawn-from-source", "Build Dawn from source") orelse false,
}; };
const lib = b.addStaticLibrary("gpu", "src/main.zig");
lib.setTarget(target);
lib.setBuildMode(mode);
lib.install();
link(b, lib, .{ .gpu_dawn_options = gpu_dawn_options });
const main_tests = b.addTest("src/main.zig"); const main_tests = b.addTest("src/main.zig");
main_tests.setTarget(target); main_tests.setTarget(target);
main_tests.setBuildMode(mode); main_tests.setBuildMode(mode);
@ -51,18 +45,6 @@ pub const pkg = std.build.Pkg{
}; };
pub fn link(b: *std.build.Builder, step: *std.build.LibExeObjStep, options: Options) void { pub fn link(b: *std.build.Builder, step: *std.build.LibExeObjStep, options: Options) void {
const main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "src/main.zig" }) catch unreachable;
const lib = b.addStaticLibrary("gpu", main_abs);
lib.setBuildMode(step.build_mode);
lib.setTarget(step.target);
const glfw_main_abs = std.fs.path.join(b.allocator, &.{ thisDir(), "libs/mach-glfw/src/main.zig" }) catch unreachable;
lib.addPackagePath("glfw", glfw_main_abs);
glfw.link(b, lib, options.glfw_options);
gpu_dawn.link(b, lib, options.gpu_dawn_options);
lib.install();
glfw.link(b, step, options.glfw_options); glfw.link(b, step, options.glfw_options);
gpu_dawn.link(b, step, options.gpu_dawn_options); gpu_dawn.link(b, step, options.gpu_dawn_options);
} }