diff options
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/fullscreen.rs | 4 | ||||
| -rw-r--r-- | examples/multiwindow.rs | 4 | ||||
| -rw-r--r-- | examples/support/mod.rs | 8 | ||||
| -rw-r--r-- | examples/window.rs | 4 |
4 files changed, 5 insertions, 15 deletions
diff --git a/examples/fullscreen.rs b/examples/fullscreen.rs index 6a2af2c..c77569f 100644 --- a/examples/fullscreen.rs +++ b/examples/fullscreen.rs @@ -1,7 +1,5 @@ -#![feature(phase)] - #[cfg(target_os = "android")] -#[phase(plugin, link)] +#[macro_use] extern crate android_glue; extern crate glutin; diff --git a/examples/multiwindow.rs b/examples/multiwindow.rs index 1f390cd..fc01ef0 100644 --- a/examples/multiwindow.rs +++ b/examples/multiwindow.rs @@ -1,7 +1,5 @@ -#![feature(phase)] - #[cfg(target_os = "android")] -#[phase(plugin, link)] +#[macro_use] extern crate android_glue; extern crate glutin; diff --git a/examples/support/mod.rs b/examples/support/mod.rs index 02079fd..7144952 100644 --- a/examples/support/mod.rs +++ b/examples/support/mod.rs @@ -1,8 +1,5 @@ #![cfg(feature = "window")] -#[no_link] -extern crate gl_generator; - use glutin; #[cfg(not(target_os = "android"))] @@ -24,9 +21,8 @@ pub fn load(window: &glutin::Window) -> Context { let gl = gl::Gl::load(window); let version = unsafe { - use std::ffi::c_str_to_bytes; - let ref version = gl.GetString(gl::VERSION) as *const i8; - String::from_utf8_lossy(c_str_to_bytes(version)).into_owned() + use std::ffi; + ffi::c_str_to_bytes(&(gl.GetString(gl::VERSION) as *const i8)).to_string() }; println!("OpenGL version {}", version); diff --git a/examples/window.rs b/examples/window.rs index 910d6e6..9cb59c8 100644 --- a/examples/window.rs +++ b/examples/window.rs @@ -1,7 +1,5 @@ -#![feature(phase)] - #[cfg(target_os = "android")] -#[phase(plugin, link)] +#[macro_use] extern crate android_glue; extern crate glutin; |