Skip to content
This repository has been archived by the owner on Sep 22, 2024. It is now read-only.

fix Linux build #3

Open
wants to merge 1 commit into
base: new-keyboard-v3
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion glutin/src/platform/unix.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ pub use glutin_egl_sys::EGLContext;
#[cfg(feature = "x11")]
pub use glutin_glx_sys::GLXContext;

pub use winit::platform::unix::*;
#[cfg(feature = "wayland")]
pub use winit::platform::wayland::{self, EventLoopWindowTargetExtWayland, WindowExtWayland};
#[cfg(feature = "x11")]
pub use winit::platform::x11::{self, EventLoopWindowTargetExtX11, WindowBuilderExtX11, WindowExtX11};

use std::os::raw;

Expand Down
5 changes: 4 additions & 1 deletion glutin/src/platform_impl/unix/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ pub use x11::utils as x11_utils;

#[cfg(feature = "x11")]
use crate::platform::unix::x11::XConnection;
use crate::platform::unix::EventLoopWindowTargetExtUnix;
#[cfg(feature = "wayland")]
use winit::platform::wayland::EventLoopWindowTargetExtWayland;
#[cfg(feature = "x11")]
use winit::platform::x11::EventLoopWindowTargetExtX11;
use winit::dpi;
use winit::event_loop::EventLoopWindowTarget;
use winit::window::{Window, WindowBuilder};
Expand Down
2 changes: 1 addition & 1 deletion glutin/src/platform_impl/unix/wayland.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use crate::{
ContextError, CreationError, GlAttributes, PixelFormat, PixelFormatRequirements, Rect,
};

use crate::platform::unix::{EventLoopWindowTargetExtUnix, WindowExtUnix};
use crate::platform::unix::{EventLoopWindowTargetExtWayland, WindowExtWayland};
use glutin_egl_sys as ffi;
pub use wayland_client::sys::client::wl_display;
use winit;
Expand Down
4 changes: 2 additions & 2 deletions glutin/src/platform_impl/unix/x11.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use crate::api::egl::{
};
use crate::api::glx::{Context as GlxContext, GLX};
use crate::platform::unix::x11::XConnection;
use crate::platform::unix::{EventLoopWindowTargetExtUnix, WindowBuilderExtUnix, WindowExtUnix};
use crate::platform::unix::{EventLoopWindowTargetExtX11, WindowBuilderExtX11, WindowExtX11};
use crate::platform_impl::x11_utils;
use crate::{
Api, ContextError, CreationError, GlAttributes, GlRequest, PixelFormat,
Expand Down Expand Up @@ -462,7 +462,7 @@ impl Context {
EglSurfaceType::Window,
fallback,
fallback,
Some(wb.window.transparent),
Some(wb.transparent()),
)?;

// getting the `visual_infos` (a struct that contains information about
Expand Down