Skip to content

Commit

Permalink
update Emscripten SDK to 3.1.61
Browse files Browse the repository at this point in the history
  • Loading branch information
floooh committed Jun 3, 2024
1 parent bcaaffa commit d9f3ef9
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 3 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@
to the example code or the supported Zig version. For actual Sokol header changes, see the
[sokol changelog](https://github.com/floooh/sokol/blob/master/CHANGELOG.md).

### 03-Jun-2024

- the Emscripten SDK dependency has been updated to 3.1.61
- the Emscripten specific parts of build.zig have been updated to be more
'idiomatic' now. This also has the nice side effect that the dirty check for
the Emscripten linker step now works as expected (e.g. the step will do
nothing if the output is uptodate)

### 01-Jun-2024

- added bindings for sokol_imgui.h (please read the section `## Dear ImGui support`
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ zig build run-debugtext-userfont
zig build run-shapes
```

(also run ```zig build --help``` to inspect the build targets)
(also run ```zig build -l``` to get a list of build targets)

By default, the backend 3D API will be selected based on the target platform:

Expand Down
3 changes: 3 additions & 0 deletions build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,9 @@ fn createEmsdkStep(b: *Build, emsdk: *Build.Dependency) *Build.Step.Run {
// NOTE 2: the file exists check is a bit hacky, it would be cleaner
// to build an on-the-fly helper tool which takes care of the SDK
// setup and just does nothing if it already happened
// NOTE 3: this code works just fine when the SDK version is updated in build.zig.zon
// since this will be cloned into a new zig cache directory which doesn't have
// an .emscripten file yet until the one-time setup.
fn emSdkSetupStep(b: *Build, emsdk: *Build.Dependency) !?*Build.Step.Run {
const dot_emsc_path = emSdkLazyPath(b, emsdk, &.{".emscripten"}).getPath(b);
const dot_emsc_exists = !std.meta.isError(std.fs.accessAbsolute(dot_emsc_path, .{}));
Expand Down
4 changes: 2 additions & 2 deletions build.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
},
.dependencies = .{
.emsdk = .{
.url = "git+https://github.com/emscripten-core/emsdk#176dec4875db4d74c2038d7e8af3395be38d222c",
.hash = "122034cf4aca9f97fea3c34f3e9fe92e56f08e2160efe3c95d7ec89260e621426a81",
.url = "git+https://github.com/emscripten-core/emsdk#3.1.61",
.hash = "12200ba39d83227f5de08287b043b011a2eb855cdb077f4b165edce30564ba73400e",
},
},
}

0 comments on commit d9f3ef9

Please sign in to comment.