Merge master into stdweb-eventloop-2
Update the internal APIs to match the new API changes
This commit is contained in:
commit
f2b6ef2edd
86 changed files with 10095 additions and 7707 deletions
|
|
@ -87,8 +87,6 @@ extern crate serde;
|
|||
|
||||
#[cfg(target_os = "windows")]
|
||||
extern crate winapi;
|
||||
#[cfg(target_os = "windows")]
|
||||
extern crate backtrace;
|
||||
#[macro_use]
|
||||
#[cfg(target_os = "windows")]
|
||||
extern crate bitflags;
|
||||
|
|
@ -98,6 +96,8 @@ extern crate objc;
|
|||
#[cfg(target_os = "macos")]
|
||||
extern crate cocoa;
|
||||
#[cfg(target_os = "macos")]
|
||||
extern crate dispatch;
|
||||
#[cfg(target_os = "macos")]
|
||||
extern crate core_foundation;
|
||||
#[cfg(target_os = "macos")]
|
||||
extern crate core_graphics;
|
||||
|
|
@ -116,6 +116,8 @@ extern crate stdweb;
|
|||
extern crate calloop;
|
||||
|
||||
pub mod dpi;
|
||||
#[macro_use]
|
||||
pub mod error;
|
||||
pub mod event;
|
||||
pub mod event_loop;
|
||||
mod icon;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue