alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2025-01-11 13:31:29 +11:00
Code Issues Packages Projects Releases Wiki Activity

Fix the examples

Browse source
This commit is contained in:
Ryan Goldstein 2019-09-24 19:44:43 -04:00
parent 86bafdc104
commit dcd9ddde50
3 changed files with 18 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
examples/custom_events.rs
View file

@ -1,3 +1,5 @@
#[cfg(not(target_arch = "wasm32"))]
fn main() {
use winit::{ use winit::{
event::{Event, WindowEvent}, event::{Event, WindowEvent},
event_loop::{ControlFlow, EventLoop}, event_loop::{ControlFlow, EventLoop},
@ -9,7 +11,6 @@ enum CustomEvent {
Timer, Timer,
} }
fn main() {
let event_loop = EventLoop::<CustomEvent>::with_user_event(); let event_loop = EventLoop::<CustomEvent>::with_user_event();
let _window = WindowBuilder::new() let _window = WindowBuilder::new()
@ -39,3 +40,8 @@ fn main() {
_ => *control_flow = ControlFlow::Wait, _ => *control_flow = ControlFlow::Wait,
}); });
} }
#[cfg(target_arch = "wasm32")]
fn main() {
panic!("This example is not supported on web.");
}

8
examples/multithreaded.rs
View file

@ -2,15 +2,7 @@
fn main() { fn main() {
extern crate env_logger; extern crate env_logger;
<<<<<<< HEAD
use std::{collections::HashMap, sync::mpsc, thread, time::Duration}; use std::{collections::HashMap, sync::mpsc, thread, time::Duration};
=======
use winit::{
event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent},
event_loop::{ControlFlow, EventLoop},
window::{CursorIcon, Fullscreen, WindowBuilder},
};
>>>>>>> master
use winit::{ use winit::{
event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent}, event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent},

16
examples/window_run_return.rs
View file

@ -1,6 +1,3 @@
<<<<<<< HEAD
#[cfg(not(target_arch = "wasm32"))]
=======
// Limit this example to only compatible platforms. // Limit this example to only compatible platforms.
#[cfg(any( #[cfg(any(
target_os = "windows", target_os = "windows",
@ -11,7 +8,6 @@
target_os = "netbsd", target_os = "netbsd",
target_os = "openbsd" target_os = "openbsd"
))] ))]
>>>>>>> master
fn main() { fn main() {
use winit::{ use winit::{
event::{Event, WindowEvent}, event::{Event, WindowEvent},
@ -19,10 +15,6 @@ fn main() {
platform::desktop::EventLoopExtDesktop, platform::desktop::EventLoopExtDesktop,
window::WindowBuilder, window::WindowBuilder,
}; };
<<<<<<< HEAD
=======
>>>>>>> master
let mut event_loop = EventLoop::new(); let mut event_loop = EventLoop::new();
let window = WindowBuilder::new() let window = WindowBuilder::new()
@ -57,13 +49,7 @@ fn main() {
println!("Okay we're done now for real."); println!("Okay we're done now for real.");
} }
<<<<<<< HEAD #[cfg(any(target_os = "ios", target_os = "android", target_arch = "wasm32"))]
#[cfg(target_arch = "wasm32")]
fn main() {
panic!("Example not supported on Wasm");
=======
#[cfg(any(target_os = "ios", target_os = "android"))]
fn main() { fn main() {
println!("This platform doesn't support run_return."); println!("This platform doesn't support run_return.");
>>>>>>> master
} }