Skip to content

Commit

Permalink
WIP: Decouple glutin from winit
Browse files Browse the repository at this point in the history
Thit commit removes direct dependency on the winit and
using raw_window_handle crate instead
  • Loading branch information
kchibisov committed Jul 30, 2022
1 parent 38f7344 commit 7db2397
Show file tree
Hide file tree
Showing 63 changed files with 4,307 additions and 8,958 deletions.
66 changes: 21 additions & 45 deletions glutin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,63 +3,39 @@ name = "glutin"
version = "0.28.0"
authors = ["The glutin contributors", "Pierre Krieger <[email protected]>"]
description = "Cross-platform OpenGL context provider."
keywords = ["windowing", "opengl"]
keywords = ["windowing", "opengl", "egl", "glx", "wgl", "cgl"]
license = "Apache-2.0"
readme = "../README.md"
repository = "https://github.com/rust-windowing/glutin"
documentation = "https://docs.rs/glutin"
edition = "2018"

[package.metadata.docs.rs]
features = ["serde"]
edition = "2021"

[features]
serde = ["winit/serde"]
x11 = ["winit/x11", "glutin_glx_sys"]
wayland = ["winit/wayland", "winit/wayland-dlopen", "wayland-client", "wayland-egl"]
wayland-dlopen = ["winit/wayland-dlopen"]
default = ["x11", "wayland", "wayland-dlopen"]
default = ["egl", "glx", "x11", "wayland", "wgl"]
egl = ["glutin_egl_sys", "glutin_gles2_sys"]
glx = ["x11", "x11-dl", "glutin_glx_sys"]
wgl = []
x11 = ["x11-dl"]
wayland = ["wayland-egl"]

[dependencies]
lazy_static = "1.3"
winit = { version = "0.26", default-features = false }
libloading = "0.7.3"
once_cell = "1.12"
raw-window-handle = "0.5.0"
bitflags = "1.3.2"

[target.'cfg(target_os = "windows")'.dependencies]
glutin_egl_sys = { version = "0.1.5", path = "../glutin_egl_sys", optional = true }
glutin_gles2_sys = { version = "0.1.5", path = "../glutin_gles2_sys", optional = true }

[target.'cfg(target_os = "android")'.dependencies]
glutin_egl_sys = { version = "0.1.5", path = "../glutin_egl_sys" }
libloading = "0.7"
parking_lot = "0.11"
raw-window-handle = "0.4"

[target.'cfg(any(target_os = "ios", target_os = "macos"))'.dependencies]
objc = "0.2.6"
glutin_gles2_sys = { version = "0.1.5", path = "../glutin_gles2_sys" }

[target.'cfg(target_os = "macos")'.dependencies]
cgl = "0.3"
cocoa = "0.24"
core-foundation = "0.9"

[target.'cfg(target_os = "windows")'.dependencies.winapi]
version = "0.3"
features = [
"winnt",
"winuser",
"wingdi",
"libloaderapi",
]

[target.'cfg(target_os = "windows")'.dependencies]
libloading = "0.7"
glutin_wgl_sys = { version = "0.1.5", path = "../glutin_wgl_sys" }
glutin_egl_sys = { version = "0.1.5", path = "../glutin_egl_sys" }
parking_lot = "0.11"

[target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "dragonfly", target_os = "netbsd", target_os = "openbsd"))'.dependencies]
osmesa-sys = "0.1"
wayland-client = { version = "0.29", features = ["dlopen"], optional = true }
wayland-egl = { version = "0.29", optional = true }
libloading = "0.7"
glutin_egl_sys = { version = "0.1.5", path = "../glutin_egl_sys" }
wayland-egl = { version = "0.29.4", optional = true }
x11-dl = { version = "2.19.1", optional = true }
glutin_glx_sys = { version = "0.1.7", path = "../glutin_glx_sys", optional = true }
parking_lot = "0.11"
log = "0.4"
glutin_egl_sys = { version = "0.1.5", path = "../glutin_egl_sys", optional = true }
glutin_gles2_sys = { version = "0.1.5", path = "../glutin_gles2_sys", optional = true }

69 changes: 0 additions & 69 deletions glutin/src/api/dlloader.rs

This file was deleted.

Loading

0 comments on commit 7db2397

Please sign in to comment.