rust-openvr · Ralith · May 6, 2017 · May 7, 2017 · May 7, 2017 · May 11, 2017
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "openvr"]
+	path = openvr
+	url = https://github.com/ValveSoftware/openvr.git
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,9 +9,17 @@ authors = [
 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"
diff --git a/build.rs b/build.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++");
 }
diff --git a/lib.rs b/lib.rs
diff --git a/openvr b/openvr
diff --git a/openvr/LICENSE b/openvr/LICENSE
diff --git a/openvr/README b/openvr/README
diff --git a/openvr/bin/linux32/libopenvr_api.so b/openvr/bin/linux32/libopenvr_api.so
diff --git a/openvr/bin/linux32/libopenvr_api.so.dbg b/openvr/bin/linux32/libopenvr_api.so.dbg
diff --git a/openvr/bin/linux64/libopenvr_api.so b/openvr/bin/linux64/libopenvr_api.so
diff --git a/openvr/bin/linux64/libopenvr_api.so.dbg b/openvr/bin/linux64/libopenvr_api.so.dbg
diff --git a/openvr/bin/osx32/libopenvr_api.dylib b/openvr/bin/osx32/libopenvr_api.dylib
diff --git a/openvr/bin/osx32/libopenvr_api.dylib.dSYM/Contents/Info.plist b/openvr/bin/osx32/libopenvr_api.dylib.dSYM/Contents/Info.plist
diff --git a/openvr/bin/osx32/libopenvr_api.dylib.dSYM/Contents/Resources/DWARF/libopenvr_api.dylib b/openvr/bin/osx32/libopenvr_api.dylib.dSYM/Contents/Resources/DWARF/libopenvr_api.dylib
diff --git a/openvr/bin/win32/openvr_api.dll b/openvr/bin/win32/openvr_api.dll
diff --git a/openvr/bin/win64/openvr_api.dll b/openvr/bin/win64/openvr_api.dll