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

mach: wasm specific build system fixes

Browse source 
- Disable some examples
- Dont compile shaderexp at all
- Block off all run steps
This commit is contained in:
iddev5 2022-05-21 23:45:54 +05:30 • committed by Stephen Gutekanst
parent 7466f32b62
commit ae4374b9df
1 changed files with 30 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

53
build.zig
View file

@ -31,13 +31,13 @@ pub fn build(b: *std.build.Builder) void {
inline for ([_]ExampleDefinition{ inline for ([_]ExampleDefinition{
.{ .name = "triangle" }, .{ .name = "triangle" },
.{ .name = "boids" }, //.{ .name = "boids" },
.{ .name = "rotating-cube", .packages = &[_]Pkg{Packages.zmath} }, .{ .name = "rotating-cube", .packages = &[_]Pkg{Packages.zmath} },
.{ .name = "two-cubes", .packages = &[_]Pkg{Packages.zmath} }, .{ .name = "two-cubes", .packages = &[_]Pkg{Packages.zmath} },
.{ .name = "instanced-cube", .packages = &[_]Pkg{Packages.zmath} }, .{ .name = "instanced-cube", .packages = &[_]Pkg{Packages.zmath} },
.{ .name = "gkurve", .packages = &[_]Pkg{ Packages.zmath, Packages.zigimg } }, .{ .name = "gkurve", .packages = &[_]Pkg{ Packages.zmath, Packages.zigimg } },
.{ .name = "advanced-gen-texture-light", .packages = &[_]Pkg{Packages.zmath} }, .{ .name = "advanced-gen-texture-light", .packages = &[_]Pkg{Packages.zmath} },
.{ .name = "textured-cube", .packages = &[_]Pkg{ Packages.zmath, Packages.zigimg } }, //.{ .name = "textured-cube", .packages = &[_]Pkg{ Packages.zmath, Packages.zigimg } },
.{ .name = "fractal-cube", .packages = &[_]Pkg{Packages.zmath} }, .{ .name = "fractal-cube", .packages = &[_]Pkg{Packages.zmath} },
}) |example| { }) |example| {
const example_app = App.init( const example_app = App.init(
@ -52,28 +52,32 @@ pub fn build(b: *std.build.Builder) void {
example_app.setBuildMode(mode); example_app.setBuildMode(mode);
example_app.link(options); example_app.link(options);
const example_run_cmd = example_app.run(); if (target.toTarget().cpu.arch != .wasm32) {
example_run_cmd.step.dependOn(&example_app.getInstallStep().?.step); const example_run_cmd = example_app.run();
const example_run_step = b.step("run-example-" ++ example.name, "Run the example"); example_run_cmd.step.dependOn(&example_app.getInstallStep().?.step);
example_run_step.dependOn(&example_run_cmd.step); const example_run_step = b.step("run-example-" ++ example.name, "Run the example");
example_run_step.dependOn(&example_run_cmd.step);
}
} }
const shaderexp_app = App.init( if (target.toTarget().cpu.arch != .wasm32) {
b, const shaderexp_app = App.init(
.{ b,
.name = "shaderexp", .{
.src = "shaderexp/main.zig", .name = "shaderexp",
.target = target, .src = "shaderexp/main.zig",
.deps = &.{ glfw.pkg, gpu.pkg, pkg }, .target = target,
}, .deps = &.{ glfw.pkg, gpu.pkg, pkg },
); },
shaderexp_app.setBuildMode(mode); );
shaderexp_app.link(options); shaderexp_app.setBuildMode(mode);
shaderexp_app.link(options);
const shaderexp_run_cmd = shaderexp_app.run(); const shaderexp_run_cmd = shaderexp_app.run();
shaderexp_run_cmd.step.dependOn(&shaderexp_app.getInstallStep().?.step); shaderexp_run_cmd.step.dependOn(&shaderexp_app.getInstallStep().?.step);
const shaderexp_run_step = b.step("run-shaderexp", "Run shaderexp"); const shaderexp_run_step = b.step("run-shaderexp", "Run shaderexp");
shaderexp_run_step.dependOn(&shaderexp_run_cmd.step); shaderexp_run_step.dependOn(&shaderexp_run_cmd.step);
}
const compile_all = b.step("compile-all", "Compile all examples and applications"); const compile_all = b.step("compile-all", "Compile all examples and applications");
compile_all.dependOn(b.getInstallStep()); compile_all.dependOn(b.getInstallStep());
@ -122,6 +126,7 @@ const App = struct {
if (options.target.toTarget().cpu.arch == .wasm32) { if (options.target.toTarget().cpu.arch == .wasm32) {
// TODO: use options.name // TODO: use options.name
const lib = b.addSharedLibrary("application", "src/wasm.zig", .unversioned); const lib = b.addSharedLibrary("application", "src/wasm.zig", .unversioned);
lib.addPackage(gpu.pkg);
break :blk lib; break :blk lib;
} else { } else {
@ -150,8 +155,10 @@ const App = struct {
.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),
}; };
glfw.link(app.b, app.step, options.glfw_options); if (app.step.target.toTarget().cpu.arch != .wasm32) {
gpu.link(app.b, app.step, gpu_options); glfw.link(app.b, app.step, options.glfw_options);
gpu.link(app.b, app.step, gpu_options);
}
} }
pub fn setBuildMode(app: *const App, mode: std.builtin.Mode) void { pub fn setBuildMode(app: *const App, mode: std.builtin.Mode) void {