alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-25 14:51:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #435 from Daggerbot/pr

Browse source 
Using x11_dl instead of x11.
This commit is contained in:
tomaka 2015-05-07 21:27:56 +02:00
parent 5e2001791d 68aff5ba0d
commit 480fd36005
3 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Cargo.toml
View file

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

8
src/api/x11/ffi.rs
View file

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

2
src/lib.rs
View file

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