Skip to content

Commit

Permalink
sysroot: user-sysroot or package-sysroot (no error on wasm)
Browse files Browse the repository at this point in the history
  • Loading branch information
kassane committed Jan 5, 2024
1 parent 5f478de commit e176d2b
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -216,12 +216,6 @@ fn buildExample(b: *Builder, target: CrossTarget, optimize: OptimizeMode, sokol:
pub fn build(b: *Builder) !void {
var options: LibSokolOptions = .{};

options.package = b.dependency("emsdk", .{});
if (b.sysroot) |sysroot|
options.sysroot = sysroot
else
options.sysroot = b.pathJoin(&.{ options.packagePath(b), "upstream", "emscripten", "cache", "sysroot" });

const force_gl = b.option(bool, "gl", "Force GL backend") orelse false;
options.backend = if (force_gl) .gl else .auto;

Expand All @@ -234,6 +228,13 @@ pub fn build(b: *Builder) !void {
const target = b.standardTargetOptions(.{});
const optimize = b.standardOptimizeOption(.{});
options.optimize = optimize;
if (target.result.isWasm()) {
options.package = b.dependency("emsdk", .{});
if (b.sysroot) |sysroot|
options.sysroot = sysroot
else
options.sysroot = b.pathJoin(&.{ options.packagePath(b), "upstream", "emscripten", "cache", "sysroot" });
}
const sokol = buildSokol(b, target, optimize, options, "");

const examples = .{
Expand Down

0 comments on commit e176d2b

Please sign in to comment.