Compare commits

..

No commits in common. "wasm" and "master" have entirely different histories.
wasm ... master

2 changed files with 29 additions and 63 deletions

View File

@ -1,7 +1,4 @@
const std = @import("std");
const sokol = @import("sokol");
const title = "sok";
pub fn build(b: *std.Build) void {
const target = b.standardTargetOptions(.{});
@ -9,78 +6,49 @@ pub fn build(b: *std.Build) void {
const dep_sokol = b.dependency("sokol", .{ .target = target, .optimize = optimize });
if (!target.result.isWasm()) {
// Native exe
// Exe
const exe = b.addExecutable(.{
.name = title,
.root_source_file = b.path("src/main.zig"),
.target = target,
.optimize = optimize,
});
const exe = b.addExecutable(.{
.name = "sok",
.root_source_file = b.path("src/main.zig"),
.target = target,
.optimize = optimize,
});
exe.root_module.addImport("sokol", dep_sokol.module("sokol"));
exe.root_module.addImport("sokol", dep_sokol.module("sokol"));
// Set this to hide console on windows
//exe.subsystem = .Windows;
// Set this to hide console on windows
//exe.subsystem = .Windows;
b.installArtifact(exe);
b.installArtifact(exe);
// Check step (for ZLS)
// Check step (for ZLS)
const exe_check = b.addExecutable(.{
.name = "check_step",
.root_source_file = b.path("src/main.zig"),
.target = target,
.optimize = optimize,
});
const exe_check = b.addExecutable(.{
.name = "check_step",
.root_source_file = b.path("src/main.zig"),
.target = target,
.optimize = optimize,
});
exe_check.root_module.addImport("sokol", dep_sokol.module("sokol"));
exe_check.root_module.addImport("sokol", dep_sokol.module("sokol"));
const check = b.step("check", "Check if project compiles");
check.dependOn(&exe_check.step);
const check = b.step("check", "Check if project compiles");
check.dependOn(&exe_check.step);
// Run
// Run
const run_cmd = b.addRunArtifact(exe);
const run_cmd = b.addRunArtifact(exe);
run_cmd.step.dependOn(b.getInstallStep());
run_cmd.step.dependOn(b.getInstallStep());
if (b.args) |args| {
run_cmd.addArgs(args);
}
const run_step = b.step("run", "Run" ++ title ++ " as native app");
run_step.dependOn(&run_cmd.step);
} else {
// Web
const wasmLib = b.addStaticLibrary(.{
.name = title,
.target = target,
.optimize = optimize,
.root_source_file = b.path("src/pacman.zig"),
});
wasmLib.root_module.addImport("sokol", dep_sokol.module("sokol"));
// create a build step which invokes the Emscripten linker
const emsdk = dep_sokol.builder.dependency("emsdk", .{});
const link_step = try sokol.emLinkStep(b, .{
.lib_main = wasmLib,
.target = target,
.optimize = optimize,
.emsdk = emsdk,
.use_webgl2 = true,
.use_emmalloc = true,
.use_filesystem = false,
.shell_file_path = dep_sokol.path("src/sokol/web/shell.html").getPath(b),
});
// ...and a special run step to start the web build output via 'emrun'
const run = sokol.emRunStep(b, .{ .name = "sok", .emsdk = emsdk });
run.step.dependOn(&link_step.step);
b.step("run", "Run " ++ title ++ " as wasm").dependOn(&run.step);
if (b.args) |args| {
run_cmd.addArgs(args);
}
const run_step = b.step("run", "Run the app");
run_step.dependOn(&run_cmd.step);
// Tests
const exe_unit_tests = b.addTest(.{

View File

@ -10,8 +10,6 @@ The goal of this project is not fixed, and is just to try out some sokol feature
To build, you need to have zig master (you can use [zvm](https://www.zvm.app/) to help you with this). Then just `zig build run` and that should be it!
To build for wasm, use `zig build -Dtarget=wasm32-emscripten run`
Note that if you change shaders, you have to recompile them manually - run compile_shaders.bat.
### Live error checking