aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortomaka <pierre.krieger1708@gmail.com>2015-05-07 21:27:56 +0200
committertomaka <pierre.krieger1708@gmail.com>2015-05-07 21:27:56 +0200
commit480fd36005d7ae5cde9180e9a3bf5b28544fdf5c (patch)
tree219b1ad801832f39e6fb14fa1c3fe8659d8aa67d
parent5e2001791d70b71ee97ed88ac28067e74dafd92d (diff)
parent68aff5ba0d09953549e005f06c5f3541f81af8e9 (diff)
downloadglutin-480fd36005d7ae5cde9180e9a3bf5b28544fdf5c.tar.gz
glutin-480fd36005d7ae5cde9180e9a3bf5b28544fdf5c.zip
Merge pull request #435 from Daggerbot/pr
Using x11_dl instead of x11.
-rw-r--r--Cargo.toml15
-rw-r--r--src/api/x11/ffi.rs8
-rw-r--r--src/lib.rs2
3 files changed, 8 insertions, 17 deletions
diff --git a/Cargo.toml b/Cargo.toml
index d959351..3deaa58 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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 = "*"
diff --git a/src/api/x11/ffi.rs b/src/api/x11/ffi.rs
index 8deaf20..8c9a35d 100644
--- a/src/api/x11/ffi.rs
+++ b/src/api/x11/ffi.rs
@@ -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;
diff --git a/src/lib.rs b/src/lib.rs
index 974ef0b..d1d52fc 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -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};