Bindgen is now optional

Author: dariost

Cargo.toml

@@ -35,11 +35,12 @@ optional = true
 
 [features]
 
-default = ["use-pkgconfig"]
+default = []
 ttf = []
 image = []
 gfx = ["c_vec"]
 mixer = []
 
+use-bindgen = ["sdl2-sys/use-bindgen"]
 use-pkgconfig = ["sdl2-sys/use-pkgconfig"]
 use_mac_framework = ["sdl2-sys/use_mac_framework"]

sdl2-sys/Cargo.toml

@@ -15,8 +15,9 @@ build = "build.rs"
 name = "sdl2_sys"
 path = "src/lib.rs"
 
-[build-dependencies]
-bindgen = "0.29"
+[build-dependencies.bindgen]
+version = "0.30"
+optional = true
 
 [build-dependencies.pkg-config]
 version = "0.3.9"
@@ -26,4 +27,5 @@ optional = true
 
 default = []
 use-pkgconfig = ["pkg-config"]
+use-bindgen = ["bindgen"]
 use_mac_framework = []

sdl2-sys/build.rs

@@ -1,16 +1,57 @@
+#![allow(unused_imports, dead_code)]
+
 #[cfg(feature = "pkg-config")]
 extern crate pkg_config;
+#[cfg(feature = "bindgen")]
 extern crate bindgen;
 
 use std::path::PathBuf;
 use std::env;
+use std::fs;
 
 const SDL2_BUNDLED_VERSION: &str = "2.0.5";
 
 fn main() {
     let target = env::var("TARGET").expect("Cargo build scripts always have TARGET");
     let host = env::var("HOST").expect("Cargo build scripts always have HOST");
-    let target_os = target.split("-").nth(2).unwrap();
+
+    prepare_bindings(&target, &host);
+
+    if get_os_from_triple(&target).unwrap() == "ios" {
+        println!("cargo:rustc-flags=-l framework=AVFoundation");
+        println!("cargo:rustc-flags=-l framework=AudioToolbox");
+        println!("cargo:rustc-flags=-l framework=CoreAudio");
+        println!("cargo:rustc-flags=-l framework=CoreGraphics");
+        println!("cargo:rustc-flags=-l framework=CoreMotion");
+        println!("cargo:rustc-flags=-l framework=Foundation");
+        println!("cargo:rustc-flags=-l framework=GameController");
+        println!("cargo:rustc-flags=-l framework=OpenGLES");
+        println!("cargo:rustc-flags=-l framework=QuartzCore");
+        println!("cargo:rustc-flags=-l framework=UIKit");
+    }
+}
+
+#[cfg(not(feature = "pkg-config"))]
+fn build_pkgconfig() -> bool {
+    false
+}
+
+#[cfg(feature = "pkg-config")]
+fn build_pkgconfig() -> bool {
+    pkg_config::probe_library("sdl2").is_ok()
+}
+
+#[cfg(not(feature = "bindgen"))]
+fn prepare_bindings(target: &str, host: &str) {
+    add_explicit_linker_flags(get_os_from_triple(target).unwrap());
+    let out_path = PathBuf::from(env::var("OUT_DIR").unwrap());
+    let crate_path = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
+    fs::copy(crate_path.join("pregenerated_bindings.rs"), out_path.join("bindings.rs"))
+        .expect("Couldn't find pregenerated bindings!");
+}
+
+#[cfg(feature = "bindgen")]
+fn prepare_bindings(target: &str, host: &str) {
     let mut bindings = bindgen::Builder::default();
 
     // Set correct target triple when cross-compiling
@@ -21,7 +62,7 @@ fn main() {
 
     if let Ok(include_path) = env::var("SDL2_INCLUDE_PATH") {
         bindings = bindings.clang_arg(String::from("-I") + &include_path);
-        add_explicit_linker_flags(target_os);
+        add_explicit_linker_flags(get_os_from_triple(target).unwrap());
     } else if build_pkgconfig() {
         #[cfg(feature = "pkg-config")]
         for path in &pkg_config::find_library("sdl2").unwrap().include_paths {
@@ -34,20 +75,7 @@ fn main() {
         include_path.push("include");
         bindings = bindings.clang_arg(String::from("-I") +
                                       &include_path.into_os_string().into_string().unwrap());
-        add_explicit_linker_flags(target_os);
-    }
-
-    if target_os == "ios" {
-        println!("cargo:rustc-flags=-l framework=AVFoundation");
-        println!("cargo:rustc-flags=-l framework=AudioToolbox");
-        println!("cargo:rustc-flags=-l framework=CoreAudio");
-        println!("cargo:rustc-flags=-l framework=CoreGraphics");
-        println!("cargo:rustc-flags=-l framework=CoreMotion");
-        println!("cargo:rustc-flags=-l framework=Foundation");
-        println!("cargo:rustc-flags=-l framework=GameController");
-        println!("cargo:rustc-flags=-l framework=OpenGLES");
-        println!("cargo:rustc-flags=-l framework=QuartzCore");
-        println!("cargo:rustc-flags=-l framework=UIKit");
+        add_explicit_linker_flags(get_os_from_triple(target).unwrap());
     }
 
     let bindings = bindings
@@ -69,14 +97,9 @@ fn main() {
         .expect("Couldn't write bindings!");
 }
 
-#[cfg(not(feature = "pkg-config"))]
-fn build_pkgconfig() -> bool {
-    false
-}
-
-#[cfg(feature = "pkg-config")]
-fn build_pkgconfig() -> bool {
-    pkg_config::probe_library("sdl2").is_ok()
+fn get_os_from_triple(triple: &str) -> Option<&str>
+{
+    triple.split("-").nth(2)
 }
 
 fn add_explicit_linker_flags(target_os: &str) {