From 228732877a6c64f2d923d04bd6ed4c771289ecdf Mon Sep 17 00:00:00 2001 From: mitchmindtree Date: Sun, 8 Nov 2015 21:13:25 +1100 Subject: Lock objc version, add casts to appease libc pointer type conflict. Closes #654 --- Cargo.toml | 14 +++++++------- src/api/cocoa/mod.rs | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5cccfe1..5ee7201 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,23 +27,23 @@ clock_ticks = "0.1.0" version = "0.1" [target.i386-apple-ios.dependencies] -objc = "0.1" +objc = ">=0.1.0, <=0.1.7" [target.x86_64-apple-ios.dependencies] -objc = "0.1" +objc = ">=0.1.0, <=0.1.7" [target.aarch64-apple-ios.dependencies] -objc = "0.1" +objc = ">=0.1.0, <=0.1.7" [target.armv7s-apple-ios.dependencies] -objc = "0.1" +objc = ">=0.1.0, <=0.1.7" [target.armv7-apple-ios.dependencies] -objc = "0.1" +objc = ">=0.1.0, <=0.1.7" [target.x86_64-apple-darwin.dependencies] -objc = "0.1" -cgl = "0" +objc = ">=0.1.0, <=0.1.7" +cgl = "0.1" cocoa = "0.1.4" core-foundation = "0" core-graphics = "0" diff --git a/src/api/cocoa/mod.rs b/src/api/cocoa/mod.rs index 2b4b5e5..c6d53d4 100644 --- a/src/api/cocoa/mod.rs +++ b/src/api/cocoa/mod.rs @@ -310,7 +310,7 @@ impl Window { let obj = context.CGLContextObj(); let mut opacity = 0; - CGLSetParameter(obj, kCGLCPSurfaceOpacity, &mut opacity); + CGLSetParameter(obj as *mut _, kCGLCPSurfaceOpacity, &mut opacity); } app.activateIgnoringOtherApps_(YES); @@ -558,7 +558,7 @@ impl Window { let value = if opengl.vsync { 1 } else { 0 }; cxt.setValues_forParameter_(&value, NSOpenGLContextParameter::NSOpenGLCPSwapInterval); - CGLEnable(cxt.CGLContextObj(), kCGLCECrashOnRemovedFunctions); + CGLEnable(cxt.CGLContextObj() as *mut _, kCGLCECrashOnRemovedFunctions); Ok((cxt, pf)) } else { -- cgit v1.2.3