download openvr sdk

.github/workflows/rust.yml

@@ -24,6 +24,9 @@ jobs:
           components: clippy
       - uses: Swatinem/rust-cache@v1
 
+      - run: |
+        cargo xtask prepare-deps --platform windows
+
       - uses: ErichDonGubler/clippy-check@fix-windows-lf-breaking-reports
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -124,7 +127,9 @@ jobs:
           override: true
       - uses: Swatinem/rust-cache@v1
 
-      - run: sudo apt update && sudo apt install libgtk-3-dev
+      - run: |
+        sudo apt update && sudo apt install libgtk-3-dev
+        cargo xtask prepare-deps --platform linux
 
       - name: Run tests
         uses: actions-rs/cargo@v1

alvr/server/build.rs

@@ -16,6 +16,17 @@ fn get_ffmpeg_path() -> PathBuf {
     }
 }
 
+fn get_openvr_path() -> PathBuf {
+    let openvr_path = alvr_filesystem::deps_dir()
+        .join(if cfg!(target_os = "linux") {
+            "linux"
+        } else {
+            "windows"
+        })
+        .join("openvr");
+    openvr_path
+}
+
 #[cfg(all(target_os = "linux", feature = "gpl"))]
 fn get_linux_x264_path() -> PathBuf {
     alvr_filesystem::deps_dir().join("linux/x264/alvr_build")
@@ -24,7 +35,7 @@ fn get_linux_x264_path() -> PathBuf {
 fn main() {
     let platform_name = env::var("CARGO_CFG_TARGET_OS").unwrap();
     let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
-    let cpp_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap()).join("cpp");
+    let _cpp_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap()).join("cpp");
 
     let platform_subpath = match platform_name.as_str() {
         "windows" => "cpp/platform/win32",
@@ -65,7 +76,7 @@ fn main() {
         .files(source_files_paths)
         .flag_if_supported("-isystemcpp/openvr/headers") // silences many warnings from openvr headers
         .flag_if_supported("-std=c++17")
-        .include("cpp/openvr/headers")
+        .include(get_openvr_path().join("headers"))
         .include("cpp");
 
     if platform_name == "windows" {
@@ -183,7 +194,7 @@ fn main() {
     if platform_name != "macos" {
         println!(
             "cargo:rustc-link-search=native={}",
-            cpp_dir.join("openvr/lib").to_string_lossy()
+            get_openvr_path().join("lib/win64").to_string_lossy()
         );
         println!("cargo:rustc-link-lib=openvr_api");
     }