Skip to content

Commit

Permalink
Merge pull request #2427 from iced-rs/winit-0.30
Browse files Browse the repository at this point in the history
Update `winit` to `0.30`
  • Loading branch information
hecrj authored May 8, 2024
2 parents 247870f + 7e7285d commit e07b42a
Show file tree
Hide file tree
Showing 12 changed files with 920 additions and 632 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ jobs:
run: cargo build --package tour --target wasm32-unknown-unknown
- name: Check compilation of `todos` example
run: cargo build --package todos --target wasm32-unknown-unknown
- name: Check compilation of `integration` example
run: cargo build --package integration --target wasm32-unknown-unknown

widget:
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -172,11 +172,11 @@ unicode-segmentation = "1.0"
wasm-bindgen-futures = "0.4"
wasm-timer = "0.2"
web-sys = "=0.3.67"
web-time = "0.2"
web-time = "1.1"
wgpu = "0.19"
winapi = "0.3"
window_clipboard = "0.4.1"
winit = { git = "https://github.com/iced-rs/winit.git", rev = "592bd152f6d5786fae7d918532d7db752c0d164f" }
winit = { git = "https://github.com/iced-rs/winit.git", rev = "8affa522bc6dcc497d332a28c03491d22a22f5a7" }

[workspace.lints.rust]
rust_2018_idioms = "forbid"
Expand Down
19 changes: 1 addition & 18 deletions examples/integration/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,8 @@ The __[`main`]__ file contains all the code of the example.

You can run it with `cargo run`:
```
cargo run --package integration_wgpu
cargo run --package integration
```

### How to run this example with WebGL backend
NOTE: Currently, WebGL backend is still experimental, so expect bugs.

```sh
# 0. Install prerequisites
cargo install wasm-bindgen-cli https
# 1. cd to the current folder
# 2. Compile wasm module
cargo build -p integration_wgpu --target wasm32-unknown-unknown
# 3. Invoke wasm-bindgen
wasm-bindgen ../../target/wasm32-unknown-unknown/debug/integration_wgpu.wasm --out-dir . --target web --no-typescript
# 4. run http server
http
# 5. Open 127.0.0.1:8000 in browser
```


[`main`]: src/main.rs
[`wgpu`]: https://github.com/gfx-rs/wgpu
21 changes: 0 additions & 21 deletions examples/integration/index.html

This file was deleted.

Loading

0 comments on commit e07b42a

Please sign in to comment.