Merge pull request #9 from tomaka/update-android-glue

Update the android glue to 0.2 to use the new cargo-apk crate
This commit is contained in:
tomaka 2016-04-26 13:59:21 +02:00
commit 524bc73039
2 changed files with 3 additions and 3 deletions

View file

@ -1,6 +1,6 @@
[package] [package]
name = "winit" name = "winit"
version = "0.4.9" version = "0.5.0"
authors = ["The winit contributors, Pierre Krieger <pierre.krieger1708@gmail.com>"] authors = ["The winit contributors, Pierre Krieger <pierre.krieger1708@gmail.com>"]
description = "Cross-platform window creation library." description = "Cross-platform window creation library."
keywords = ["windowing"] keywords = ["windowing"]
@ -15,7 +15,7 @@ libc = "0.2"
shared_library = "0.1.0" shared_library = "0.1.0"
[target.arm-linux-androideabi.dependencies.android_glue] [target.arm-linux-androideabi.dependencies.android_glue]
version = "0.1" version = "0.2"
[target.i386-apple-ios.dependencies] [target.i386-apple-ios.dependencies]
objc = "0.2" objc = "0.2"

View file

@ -130,7 +130,7 @@ impl Window {
android_glue::set_multitouch(win_attribs.multitouch); android_glue::set_multitouch(win_attribs.multitouch);
Ok(Window { Ok(Window {
native_window: native_window, native_window: native_window as *const _,
event_rx: rx, event_rx: rx,
}) })
} }