Merge pull request #26 from beac0n/feature/4-create-android-app

Feature/4 create android app
beac0n · Oct 19, 2024 · 28290be · 28290be
2 parents b9e215d + b5ec469
commit 28290be
Show file tree

Hide file tree

Showing 27 changed files with 5,480 additions and 443 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -0,0 +1,3 @@
+[target.aarch64-linux-android]
+ar = "/opt/android-ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
+linker = "/opt/android-ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android35-clang"
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -135,7 +135,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: target/release/client
+          asset_path: target/x86_64-unknown-linux-gnu/release/client
           asset_name: client-${{ env.TAG_NAME }}-x86_64-linux
           asset_content_type: application/octet-stream
       - name: Upload Release Asset - Commander
@@ -144,7 +144,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: target/release/commander
+          asset_path: target/x86_64-unknown-linux-gnu/release/commander
           asset_name: commander-${{ env.TAG_NAME }}-x86_64-linux
           asset_content_type: application/octet-stream
       - name: Upload Release Asset - Server
@@ -153,6 +153,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: target/release/server
+          asset_path: target/x86_64-unknown-linux-gnu/release/server
           asset_name: server-${{ env.TAG_NAME }}-x86_64-linux
           asset_content_type: application/octet-stream
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -0,0 +1,7 @@
+{
+  "recommendations": [
+    "rust-lang.rust-analyzer",
+    "vadimcn.vscode-lldb",
+    "Slint.slint"
+  ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "[rust]": {
+        "editor.defaultFormatter": "rust-lang.rust-analyzer"
+    }
+}