Check feature use_mac_framework with mac_framework

Rust-SDL2 · Jan 15, 2017 · b3ee9b2 · b3ee9b2
1 parent 460a629
commit b3ee9b2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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 {}
 }