Update to 1.0.10 (#4)

* Update to OpenVR SDK 1.0.7

This also switches to using OpenVR as a submodule.

* Build OpenVR client lib from source and statically link

* Tweak bindings

* Work around apparently broken cmake build on windows

* Fix linking on windows

* Update to OpenVR SDK 1.0.8

* Less absurd enum names

* Update to OpenVR 1.0.10, bump version

* Work around yet another negligent upstream ABI breakage case

Author: Ralith

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "openvr"]
+	path = openvr
+	url = https://github.com/ValveSoftware/openvr.git

Cargo.toml

@@ -1,17 +1,26 @@
 [package]
 name = "openvr_sys"
-version = "1.0.1"
+version = "2.0.0"
 authors = [
     "Colin Sherratt",
     "Erick Tryzelaar",
-    "Rene Eichhorn"
+    "Rene Eichhorn",
+    "Benjamin Saunders"
 ]
 license = "MIT"
 description = "Raw unsafe system binding for openvr"
 repository = "https://github.com/rust-openvr/rust-openvr-sys"
-
+exclude = [
+    "openvr/samples/*",
+    "openvr/bin/*",
+    "openvr/lib/*",
+    "openvr/controller_callouts/*",
+]
 build = "build.rs"
 
+[build-dependencies]
+cmake = "0.1"
+
 [lib]
 name = "openvr_sys"
 path = "lib.rs"

bindings.rs

@@ -1,17 +1,21 @@
-#[cfg(target_os="macos")]
-fn main() {
-    println!("cargo:rustc-link-search={}/openvr/lib/osx32", env!("CARGO_MANIFEST_DIR"));
-    println!("cargo:rustc-link-search={}/openvr/bin/osx32", env!("CARGO_MANIFEST_DIR"));
-}
+extern crate cmake;
 
-#[cfg(target_os="linux")]
 fn main() {
-    println!("cargo:rustc-link-search={}/openvr/lib/linux64", env!("CARGO_MANIFEST_DIR"));
-    println!("cargo:rustc-link-search={}/openvr/bin/linux64", env!("CARGO_MANIFEST_DIR"));
-}
+    let mut cfg = cmake::Config::new("openvr");
 
-#[cfg(target_os="windows")]
-fn main() {
-    println!("cargo:rustc-link-search={}/openvr/lib/win64", env!("CARGO_MANIFEST_DIR"));
-    println!("cargo:rustc-link-search={}/openvr/bin/win64", env!("CARGO_MANIFEST_DIR"));
+    // Work around broken cmake build
+    #[cfg(windows)]
+    cfg.cxxflag("/DWIN32");
+
+    let dst = cfg.build();
+    println!("cargo:rustc-link-search=native={}/lib", dst.display());
+
+    #[cfg(all(windows, target_pointer_width = "64"))]
+    println!("cargo:rustc-link-lib=static=openvr_api64");
+
+    #[cfg(not(all(windows, target_pointer_width = "64")))]
+    println!("cargo:rustc-link-lib=static=openvr_api");
+
+    #[cfg(target_os="linux")]
+    println!("cargo:rustc-link-lib=stdc++");
 }