Skip to content

Commit 3b7e5f8

Browse files
rukaigoddessfreya
authored andcommitted
Get iOS compiling again (rust-windowing#1192)
1 parent d1f0cf5 commit 3b7e5f8

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

.travis.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ matrix:
3636
os: osx
3737
rust: stable
3838

39-
# # iOS
40-
# - env: TARGET=x86_64-apple-ios
41-
# os: osx
42-
# rust: nightly
43-
# - env: TARGET=x86_64-apple-ios
44-
# os: osx
45-
# rust: stable
39+
# iOS
40+
- env: TARGET=x86_64-apple-ios
41+
os: osx
42+
rust: nightly
43+
- env: TARGET=x86_64-apple-ios
44+
os: osx
45+
rust: stable
4646

4747
addons:
4848
apt:

glutin/src/api/ios/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ impl Context {
205205
let win = builder.build(el)?;
206206
let context = unsafe {
207207
let eagl_context = Context::create_context(version)?;
208-
let view = win.uiview() as ffi::id;
208+
let view = win.ui_view() as ffi::id;
209209
let mut context = Context { eagl_context, view };
210210
context.init_context(&win);
211211
context
@@ -221,7 +221,7 @@ impl Context {
221221
size: dpi::PhysicalSize,
222222
) -> Result<Self, CreationError> {
223223
let wb = winit::window::WindowBuilder::new()
224-
.with_visibility(false)
224+
.with_visible(false)
225225
.with_inner_size(size.to_logical(1.));
226226
Self::new_windowed(wb, el, pf_reqs, gl_attr)
227227
.map(|(_window, context)| context)

glutin/src/platform/mod.rs

+9
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,15 @@ pub mod unix;
2121
pub mod windows;
2222
/// Platform-specific methods for desktop operating systems.
2323
pub mod desktop {
24+
#![cfg(any(
25+
target_os = "windows",
26+
target_os = "macos",
27+
target_os = "linux",
28+
target_os = "dragonfly",
29+
target_os = "freebsd",
30+
target_os = "netbsd",
31+
target_os = "openbsd",
32+
))]
2433
pub use winit::platform::desktop::*;
2534
}
2635

0 commit comments

Comments
 (0)