Move SDL_ttf to sdl2-sys crate

Progresses on Rust-SDL2#647

Author: jonemil

Cargo.toml

@@ -37,10 +37,10 @@ optional = true
 
 unsafe_textures = []
 default = []
-ttf = []
 gfx = ["c_vec"]
 mixer = ["sdl2-sys/mixer"]
 image = ["sdl2-sys/image"]
+ttf = ["sdl2-sys/ttf"]
 
 use-bindgen = ["sdl2-sys/use-bindgen"]
 use-pkgconfig = ["sdl2-sys/use-pkgconfig"]

sdl2-sys/Cargo.toml

@@ -52,3 +52,4 @@ use_mac_framework = []
 bundled = ["cmake", "reqwest", "tar", "flate2"]
 mixer = []
 image = []
+ttf = []

sdl2-sys/build.rs

@@ -222,6 +222,15 @@ fn link_sdl2(target_os: &str) {
                 println!("cargo:rustc-flags=-l framework=SDL2_image");
             }
         }
+        if cfg!(feature = "ttf") {
+            if cfg!(any(target_os="linux", target_os="freebsd")) {
+                println!("cargo:rustc-flags=-l SDL2_ttf");
+            } else if cfg!(target_os="windows") {
+                println!("cargo:rustc-flags=-l SDL2_ttf");
+            } else if cfg!(any(target_os="macos", feature="use_mac_framework")) {
+                println!("cargo:rustc-flags=-l framework=SDL2_ttf");
+            }
+        }
     }
 }
 

sdl2-sys/src/lib.rs

@@ -15,3 +15,6 @@ pub mod mixer;
 
 #[cfg(feature = "image")]
 pub mod image;
+
+#[cfg(feature = "ttf")]
+pub mod ttf;

src/sdl2/ttf/ffi.rs renamed to sdl2-sys/src/ttf.rs

@@ -1,6 +1,5 @@
 use std::os::raw::{c_int, c_char, c_long, c_void};
-use sys;
-use sys::{SDL_Surface, SDL_Color, SDL_RWops};
+use ::{SDL_Surface, SDL_Color, SDL_RWops};
 
 
 pub const TTF_STYLE_NORMAL        : c_int = 0x00;
@@ -16,7 +15,7 @@ pub const TTF_HINTING_NONE      : c_int = 3;
 
 pub type TTF_Font = c_void;
 extern "C" {
-    pub fn TTF_Linked_Version() -> *const sys::SDL_version;
+    pub fn TTF_Linked_Version() -> *const ::SDL_version;
     pub fn TTF_ByteSwappedUNICODE(swapped: c_int);
     pub fn TTF_Init() -> c_int;
     pub fn TTF_OpenFont(file: *const c_char, ptsize: c_int) -> *const TTF_Font;

src/sdl2/ttf/context.rs

@@ -6,6 +6,7 @@ use std::path::Path;
 use ::get_error;
 use ::rwops::RWops;
 use ::version::Version;
+use sys;
 
 use super::font::{
     internal_load_font,
@@ -14,16 +15,14 @@ use super::font::{
     Font,
 };
 
-use super::ffi;
-
 /// A context manager for `SDL2_TTF` to manage C code initialization and clean-up.
 #[must_use]
 pub struct Sdl2TtfContext;
 
 // Clean up the context once it goes out of scope
 impl Drop for Sdl2TtfContext {
     fn drop(&mut self) {
-        unsafe { ffi::TTF_Quit(); }
+        unsafe { sys::ttf::TTF_Quit(); }
     }
 }
 
@@ -45,7 +44,7 @@ impl Sdl2TtfContext {
     pub fn load_font_from_rwops<'ttf,'r>(&'ttf self, rwops: RWops<'r>, point_size: u16)
             -> Result<Font<'ttf,'r>, String> {
         let raw = unsafe {
-            ffi::TTF_OpenFontRW(rwops.raw(), 0, point_size as c_int)
+            sys::ttf::TTF_OpenFontRW(rwops.raw(), 0, point_size as c_int)
         };
         if (raw as *mut ()).is_null() {
             Err(get_error())
@@ -59,7 +58,7 @@ impl Sdl2TtfContext {
     pub fn load_font_at_index_from_rwops<'ttf,'r>(&'ttf self, rwops: RWops<'r>, index: u32,
             point_size: u16) -> Result<Font<'ttf,'r>, String> {
         let raw = unsafe {
-            ffi::TTF_OpenFontIndexRW(rwops.raw(), 0, point_size as c_int,
+            sys::ttf::TTF_OpenFontIndexRW(rwops.raw(), 0, point_size as c_int,
                 index as c_long)
         };
         if (raw as *mut ()).is_null() {
@@ -73,7 +72,7 @@ impl Sdl2TtfContext {
 /// Returns the version of the dynamically linked `SDL_TTF` library
 pub fn get_linked_version() -> Version {
     unsafe {
-        Version::from_ll(*ffi::TTF_Linked_Version())
+        Version::from_ll(*sys::ttf::TTF_Linked_Version())
     }
 }
 
@@ -119,9 +118,9 @@ impl fmt::Display for InitError {
 /// clean up the library once it goes out of scope.
 pub fn init() -> Result<Sdl2TtfContext, InitError> {
     unsafe {
-        if ffi::TTF_WasInit() == 1 {
+        if sys::ttf::TTF_WasInit() == 1 {
             Err(InitError::AlreadyInitializedError)
-        } else if ffi::TTF_Init() == 0 {
+        } else if sys::ttf::TTF_Init() == 0 {
             Ok(Sdl2TtfContext)
         } else {
             Err(InitError::InitializationError(
@@ -134,6 +133,6 @@ pub fn init() -> Result<Sdl2TtfContext, InitError> {
 /// Returns whether library has been initialized already.
 pub fn has_been_initialized() -> bool {
     unsafe {
-        ffi::TTF_WasInit() == 1
+        sys::ttf::TTF_WasInit() == 1
     }
 }