Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

patch: Add dynamic execution flag to emcc build to allow for wasm-unsafe-eval in csp #263

Merged
merged 1 commit into from
Sep 19, 2022
Merged

patch: Add dynamic execution flag to emcc build to allow for wasm-unsafe-eval in csp #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Setup emsdk
uses: mymindstorm/setup-emsdk@v11
with:
version: 3.0.0
version: 3.1.20
actions-cache-folder: "emsdk-cache"
- name: Install premake
run: |
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ git checkout origin/master
cd ../../..
```

4. Install [Emscripten](https://emscripten.org/docs/getting_started/downloads.html). We build against 3.0.0 in rive-wasm
4. Install [Emscripten](https://emscripten.org/docs/getting_started/downloads.html). We build against 3.1.20 in rive-wasm
5. Install [Premake5](https://premake.github.io/) and add it to your path

6. `cd` back into the `js` folder and run `./build.sh` from your terminal/shell to build the latest WASM and builds for JS API's (high and low level) into the `npm/` folder. This may take some time, grab a coffee! This should finish with Webpack building the JS bundles for the high-level API packages (more on that below)
Expand Down
1 change: 1 addition & 0 deletions wasm/premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ linkoptions {
"-s NO_EXIT_RUNTIME=1",
"-s STRICT=1",
"-flto",
"-s DYNAMIC_EXECUTION=0",
"-s ALLOW_MEMORY_GROWTH=1",
"-s DISABLE_EXCEPTION_CATCHING=1",
"-s WASM=1",
Expand Down