From b3ee9b2f04c57cc4c75ba47ebfe052ae950b18f6 Mon Sep 17 00:00:00 2001 From: Stephen Sherratt Date: Wed, 11 Jan 2017 23:30:42 +1100 Subject: [PATCH] Check feature use_mac_framework with mac_framework --- src/sdl2/image/mod.rs | 4 ++-- src/sdl2/mixer/mod.rs | 4 ++-- src/sdl2/ttf/mod.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/sdl2/image/mod.rs b/src/sdl2/image/mod.rs index c7392060..77c528a3 100755 --- a/src/sdl2/image/mod.rs +++ b/src/sdl2/image/mod.rs @@ -33,11 +33,11 @@ use sys; // Setup linking for all targets. #[cfg(target_os="macos")] mod mac { - #[cfg(mac_framework)] + #[cfg(any(mac_framework, feature="use_mac_framework"))] #[link(kind="framework", name="SDL2_image")] extern {} - #[cfg(not(mac_framework))] + #[cfg(not(any(mac_framework, feature="use_mac_framework")))] #[link(name="SDL2_image")] extern {} } diff --git a/src/sdl2/mixer/mod.rs b/src/sdl2/mixer/mod.rs index 0669ffdc..1f879d12 100644 --- a/src/sdl2/mixer/mod.rs +++ b/src/sdl2/mixer/mod.rs @@ -34,12 +34,12 @@ use ::version::Version; // Setup linking for all targets. #[cfg(target_os="macos")] mod mac { - #[cfg(mac_framework)] + #[cfg(any(mac_framework, feature="use_mac_framework"))] #[link(kind="framework", name="SDL2_mixer")] extern "C" { } - #[cfg(not(mac_framework))] + #[cfg(not(any(mac_framework, feature="use_mac_framework")))] #[link(name="SDL2_mixer")] extern "C" { } diff --git a/src/sdl2/ttf/mod.rs b/src/sdl2/ttf/mod.rs index 59911655..f5463f3d 100644 --- a/src/sdl2/ttf/mod.rs +++ b/src/sdl2/ttf/mod.rs @@ -28,11 +28,11 @@ mod context; // Setup linking for all targets. #[cfg(target_os="macos")] mod mac { - #[cfg(mac_framework)] + #[cfg(any(mac_framework, feature="use_mac_framework"))] #[link(kind="framework", name="SDL2_ttf")] extern {} - #[cfg(not(mac_framework))] + #[cfg(not(any(mac_framework, feature="use_mac_framework")))] #[link(name="SDL2_ttf")] extern {} }