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

Lock objc version, add casts to appease libc pointer type conflict. Closes #654

Browse source
This commit is contained in:
mitchmindtree 2015-11-08 21:13:25 +11:00
parent 0386d093d1
commit 228732877a
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Cargo.toml
View file

@ -27,23 +27,23 @@ clock_ticks = "0.1.0"
version = "0.1" version = "0.1"
[target.i386-apple-ios.dependencies] [target.i386-apple-ios.dependencies]
objc = "0.1" objc = ">=0.1.0, <=0.1.7"
[target.x86_64-apple-ios.dependencies] [target.x86_64-apple-ios.dependencies]
objc = "0.1" objc = ">=0.1.0, <=0.1.7"
[target.aarch64-apple-ios.dependencies] [target.aarch64-apple-ios.dependencies]
objc = "0.1" objc = ">=0.1.0, <=0.1.7"
[target.armv7s-apple-ios.dependencies] [target.armv7s-apple-ios.dependencies]
objc = "0.1" objc = ">=0.1.0, <=0.1.7"
[target.armv7-apple-ios.dependencies] [target.armv7-apple-ios.dependencies]
objc = "0.1" objc = ">=0.1.0, <=0.1.7"
[target.x86_64-apple-darwin.dependencies] [target.x86_64-apple-darwin.dependencies]
objc = "0.1" objc = ">=0.1.0, <=0.1.7"
cgl = "0" cgl = "0.1"
cocoa = "0.1.4" cocoa = "0.1.4"
core-foundation = "0" core-foundation = "0"
core-graphics = "0" core-graphics = "0"

4
src/api/cocoa/mod.rs
View file

@ -310,7 +310,7 @@ impl Window {
let obj = context.CGLContextObj(); let obj = context.CGLContextObj();
let mut opacity = 0; let mut opacity = 0;
CGLSetParameter(obj, kCGLCPSurfaceOpacity, &mut opacity); CGLSetParameter(obj as *mut _, kCGLCPSurfaceOpacity, &mut opacity);
} }
app.activateIgnoringOtherApps_(YES); app.activateIgnoringOtherApps_(YES);
@ -558,7 +558,7 @@ impl Window {
let value = if opengl.vsync { 1 } else { 0 }; let value = if opengl.vsync { 1 } else { 0 };
cxt.setValues_forParameter_(&value, NSOpenGLContextParameter::NSOpenGLCPSwapInterval); cxt.setValues_forParameter_(&value, NSOpenGLContextParameter::NSOpenGLCPSwapInterval);
CGLEnable(cxt.CGLContextObj(), kCGLCECrashOnRemovedFunctions); CGLEnable(cxt.CGLContextObj() as *mut _, kCGLCECrashOnRemovedFunctions);
Ok((cxt, pf)) Ok((cxt, pf))
} else { } else {