From 753a038e7491d95cf639f4f8576fabad8f0421cb Mon Sep 17 00:00:00 2001 From: Woyten Date: Mon, 1 Mar 2021 23:41:13 +0100 Subject: [PATCH] Make nannou package compile in WASM environment --- .cargo/config.toml | 2 ++ .github/workflows/nannou.yml | 6 ++++++ nannou/Cargo.toml | 4 ++++ 3 files changed, 12 insertions(+) create mode 100644 .cargo/config.toml diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 000000000..d02b01e15 --- /dev/null +++ b/.cargo/config.toml @@ -0,0 +1,2 @@ +[target.wasm32-unknown-unknown] +rustflags = ["--cfg", "web_sys_unstable_apis"] diff --git a/.github/workflows/nannou.yml b/.github/workflows/nannou.yml index 296a0830c..84c025a0d 100644 --- a/.github/workflows/nannou.yml +++ b/.github/workflows/nannou.yml @@ -113,11 +113,17 @@ jobs: profile: minimal toolchain: stable override: true + target: wasm32-unknown-unknown - name: Run check uses: actions-rs/cargo@v1 with: command: check args: --examples --verbose + - name: Check nannou package builds against wasm32-unknown-unknown + uses: actions-rs/cargo@v1 + with: + command: build + args: -p nannou --features wasm-experimental --target wasm32-unknown-unknown cargo-publish: if: github.event_name == 'push' && github.ref == 'refs/heads/master' diff --git a/nannou/Cargo.toml b/nannou/Cargo.toml index bce4beb04..de6c447d3 100644 --- a/nannou/Cargo.toml +++ b/nannou/Cargo.toml @@ -31,8 +31,12 @@ toml = "0.5" walkdir = "2" wgpu_upstream = { version = "0.11", package = "wgpu" } winit = "0.25" +getrandom = "0.2.3" [features] default = ["notosans"] # Enables SPIR-V support in the `wgpu` module. spirv = ["nannou_wgpu/spirv"] +# Enables experimental WASM compilation for CI-use only +wasm-experimental = ["winit/web-sys", "getrandom/js"] +