Merge pull request #435 from Daggerbot/pr

Using x11_dl instead of x11.
This commit is contained in:
tomaka 2015-05-07 21:27:56 +02:00
commit 480fd36005
3 changed files with 8 additions and 17 deletions

View file

@ -51,23 +51,14 @@ kernel32-sys = "0.1"
[target.i686-unknown-linux-gnu.dependencies]
osmesa-sys = "0.0.5"
wayland-client = "*"
[target.i686-unknown-linux-gnu.dependencies.x11]
version = "*"
features = ["dynamic"]
x11-dl = "*"
[target.x86_64-unknown-linux-gnu.dependencies]
osmesa-sys = "0.0.5"
wayland-client = "*"
[target.x86_64-unknown-linux-gnu.dependencies.x11]
version = "*"
features = ["dynamic"]
x11-dl = "*"
[target.arm-unknown-linux-gnueabihf.dependencies]
osmesa-sys = "0.0.5"
wayland-client = "*"
[target.arm-unknown-linux-gnueabihf.dependencies.x11]
version = "*"
features = ["dynamic"]
x11-dl = "*"

View file

@ -1,7 +1,7 @@
pub use x11::keysym::*;
pub use x11::xcursor::*;
pub use x11::xf86vmode::*;
pub use x11::xlib::*;
pub use x11_dl::keysym::*;
pub use x11_dl::xcursor::*;
pub use x11_dl::xf86vmode::*;
pub use x11_dl::xlib::*;
pub use self::glx::types::GLXContext;

View file

@ -50,7 +50,7 @@ extern crate core_foundation;
#[cfg(target_os = "macos")]
extern crate glutin_core_graphics as core_graphics;
#[cfg(any(target_os = "linux", target_os = "freebsd"))]
extern crate x11;
extern crate x11_dl;
pub use events::*;
pub use headless::{HeadlessRendererBuilder, HeadlessContext};