Fixed android linkage

NexusSocial · Nov 21, 2023 · 76fa4df · 76fa4df
1 parent b4ebe08
commit 76fa4df
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 5 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -0,0 +1,3 @@
+[target.aarch64-linux-android.openxr_loader]
+rustc-link-search = ["assets/runtime_libs/arm64-v8a"]
+rustc-link-lib = ["openxr_loader"]
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -31,7 +31,7 @@ bevy-inspector-egui = "0.21.0"
 wgpu = "0.17"
 bevy_flycam = "0.12"
 bevy_oxr = "0.1"
-openxr = "0.17.1"
+openxr = { verison = "0.17.1", git="https://github.com/TheButlah/openxrs", branch = "add-links" }
 bevy_mod_inverse_kinematics = "0.5"
 
 # Enable a small amount of optimization in debug mode

diff --git a/...xr-6dof/runtime_libs/arm64-v8a/.gitignore → assets/runtime_libs/arm64-v8a/.gitignore b/...xr-6dof/runtime_libs/arm64-v8a/.gitignore → assets/runtime_libs/arm64-v8a/.gitignore
diff --git a/flake.nix b/flake.nix
@@ -49,6 +49,8 @@
             # cmake for openxr
             pkgs.cmake
           ] ++ pkgs.lib.optionals (!pkgs.stdenv.isDarwin) (with pkgs; [
+            alsa-lib
+            alsa-lib.dev
             androidenv.androidPkgs_9_0.androidsdk
           ]);
 
@@ -57,6 +59,7 @@
             pkgs.zstd
             rustPlatform.bindgenHook
           ] ++ pkgs.lib.optionals pkgs.stdenv.isLinux (with pkgs; [
+            alsa-lib
             alsa-lib.dev
             libxkbcommon
             udev

diff --git a/skills/openxr-6dof/manifest.yaml b/skills/openxr-6dof/manifest.yaml
@@ -1,6 +1,6 @@
 android:
   runtime_libs:
-    - "runtime_libs"
+    - "../../assets/runtime_libs"
   manifest:
     package: "com.github.nexussocial.skilltree.openxr_6dof"
     uses_feature: