mirror of
https://github.com/italicsjenga/winit-sonoma-fix.git
synced 2024-12-24 06:11:30 +11:00
parent
1b3b82a3c1
commit
5f24c40d05
6
.github/workflows/ci.yml
vendored
6
.github/workflows/ci.yml
vendored
|
@ -45,7 +45,7 @@ jobs:
|
||||||
- { target: aarch64-apple-ios, os: macos-latest, }
|
- { target: aarch64-apple-ios, os: macos-latest, }
|
||||||
# We're using Windows rather than Ubuntu to run the wasm tests because caching cargo-web
|
# We're using Windows rather than Ubuntu to run the wasm tests because caching cargo-web
|
||||||
# doesn't currently work on Linux.
|
# doesn't currently work on Linux.
|
||||||
- { target: wasm32-unknown-unknown, os: windows-latest, cmd: web }
|
- { target: wasm32-unknown-unknown, os: windows-latest, }
|
||||||
|
|
||||||
env:
|
env:
|
||||||
RUST_BACKTRACE: 1
|
RUST_BACKTRACE: 1
|
||||||
|
@ -76,10 +76,6 @@ jobs:
|
||||||
- name: Install cargo-apk
|
- name: Install cargo-apk
|
||||||
if: contains(matrix.platform.target, 'android')
|
if: contains(matrix.platform.target, 'android')
|
||||||
run: cargo install cargo-apk
|
run: cargo install cargo-apk
|
||||||
- name: Install cargo-web
|
|
||||||
continue-on-error: true
|
|
||||||
if: contains(matrix.platform.target, 'wasm32')
|
|
||||||
run: cargo install cargo-web
|
|
||||||
|
|
||||||
- name: Check documentation
|
- name: Check documentation
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
|
@ -99,7 +99,7 @@ fn main() {
|
||||||
if wait_cancelled {
|
if wait_cancelled {
|
||||||
*control_flow
|
*control_flow
|
||||||
} else {
|
} else {
|
||||||
ControlFlow::WaitUntil(time::Instant::now() + WAIT_TIME)
|
ControlFlow::WaitUntil(instant::Instant::now() + WAIT_TIME)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Mode::Poll => {
|
Mode::Poll => {
|
||||||
|
|
|
@ -7,6 +7,7 @@ use winit::{
|
||||||
window::WindowBuilder,
|
window::WindowBuilder,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
fn main() {
|
fn main() {
|
||||||
SimpleLogger::new().init().unwrap();
|
SimpleLogger::new().init().unwrap();
|
||||||
let event_loop = EventLoop::new();
|
let event_loop = EventLoop::new();
|
||||||
|
@ -38,3 +39,8 @@ fn main() {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(target_arch = "wasm32")]
|
||||||
|
fn main() {
|
||||||
|
unimplemented!() // `Window` can't be sent between threads
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue