migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-08-31 22:00:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #772 from ozkriff/master

Browse Source 
Update to android_glue 0.2
This commit is contained in:
tomaka
2016-05-25 21:22:13 +02:00
parent e796a2e018 18f846403b
commit 11faacefd7
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -19,7 +19,7 @@ shared_library = "0.1.0"
gl_generator = "0.5" gl_generator = "0.5"
[target.'cfg(target_os = "android")'.dependencies.android_glue] [target.'cfg(target_os = "android")'.dependencies.android_glue]
version = "0.1" version = "0.2"
[target.'cfg(target_os = "ios")'.dependencies] [target.'cfg(target_os = "ios")'.dependencies]
objc = "0.2" objc = "0.2"

5
src/api/android/ffi.rs
View File

@@ -4,6 +4,7 @@
#![allow(non_upper_case_globals)] #![allow(non_upper_case_globals)]
use libc; use libc;
use std::os::raw;
#[link(name = "android")] #[link(name = "android")]
#[link(name = "EGL")] #[link(name = "EGL")]
@@ -13,12 +14,12 @@ extern {}
/** /**
* asset_manager.h * asset_manager.h
*/ */
pub type AAssetManager = (); pub type AAssetManager = raw::c_void;
/** /**
* native_window.h * native_window.h
*/ */
pub type ANativeWindow = (); pub type ANativeWindow = raw::c_void;
extern { extern {
pub fn ANativeWindow_getHeight(window: *const ANativeWindow) -> libc::int32_t; pub fn ANativeWindow_getHeight(window: *const ANativeWindow) -> libc::int32_t;