Your Android phone and your Windows PC, working as one. Local-first, end-to-end encrypted, no account.
Merge main (macOS port #24) into linux-1-build
Beeba652febb0b0
diff --cc .github/workflows/ci.ymlindex efa503c,4cc0faf..e772e15--- a/.github/workflows/ci.yml+++ b/.github/workflows/ci.yml@@@ -132,35 -132,30 +132,59 @@@ jobspath: target/package/*-setup.exeretention-days: 14+ desktop-macos:+ name: macOS app+ runs-on: macos-latest+ steps:+ - uses: actions/checkout@v7+ - name: Install the pinned Rust toolchain+ run: rustup show active-toolchain || rustup toolchain install+ - uses: Swatinem/rust-cache@v2+ - name: Install Qt+ uses: jurplel/install-qt-action@v4+ with:+ version: ${{ env.QT_VERSION }}+ host: mac+ target: desktop+ arch: clang_64+ cache: true+ aqtsource: git+https://github.com/miurahr/aqtinstall.git+ - name: Clippy+ run: cargo clippy --locked -p nectarlink-desktop --all-targets -- -D warnings+ - name: Tests+ run: cargo test --locked -p nectarlink-desktop+ - name: Release build+ run: cargo build --locked --release -p nectarlink-desktop++ desktop-linux:+ name: Linux app (x64)+ runs-on: ubuntu-latest+ steps:+ - uses: actions/checkout@v7+ - name: Install the pinned Rust toolchain+ run: rustup show active-toolchain || rustup toolchain install+ - uses: Swatinem/rust-cache@v2+ - name: Install system dependencies+ run: |+ sudo apt-get update+ sudo apt-get install -y --no-install-recommends \+ libgl1-mesa-dev libxkbcommon-dev libvulkan-dev libx11-dev+ - name: Install Qt+ uses: jurplel/install-qt-action@v4+ with:+ version: ${{ env.QT_VERSION }}+ host: linux+ target: desktop+ arch: linux_gcc_64+ cache: true+ aqtsource: git+https://github.com/miurahr/aqtinstall.git+ - name: Clippy+ run: cargo clippy --locked -p nectarlink-desktop -p nectarlink-vcam -p s1-qt-rust --all-targets -- -D warnings+ - name: Tests+ run: cargo test --locked -p nectarlink-desktop -p nectarlink-vcam+ - name: Release build+ run: cargo build --locked --release -p nectarlink-desktop -p nectarlink-vcam+android:name: Android appruns-on: ubuntu-latestdiff --cc desktop/app/build.rsindex 121cbf8,c114410..0803f6b--- a/desktop/app/build.rs+++ b/desktop/app/build.rs@@@ -405,16 -288,11 +405,22 @@@ fn main()println!("cargo:rustc-link-lib=ole32");println!("cargo:rustc-link-lib=shell32");println!("cargo:rustc-link-lib=user32");+ } else if std::env::var("CARGO_CFG_TARGET_OS").as_deref() == Ok("linux") {+ println!("cargo:rustc-link-lib=Qt6Quick");+ println!(+ "cargo:rustc-link-arg=-Wl,-rpath,$ORIGIN:$ORIGIN/lib:$ORIGIN/../lib:$ORIGIN/../lib/nectarlink/lib"+ );+ } else if std::env::var("CARGO_CFG_TARGET_OS").as_deref() == Ok("macos") {+ println!("cargo:rustc-link-lib=framework=AppKit");+ println!("cargo:rustc-link-lib=framework=CoreGraphics");+ println!("cargo:rustc-link-lib=framework=CoreAudio");+ println!("cargo:rustc-link-lib=framework=AudioToolbox");+ println!("cargo:rustc-link-lib=framework=IOKit");}+ println!("cargo:rerun-if-changed=cpp/app_helpers.h");+ println!("cargo:rerun-if-changed=cpp/app_helpers.cpp");+ println!("cargo:rerun-if-changed=cpp/native_window.h");+ println!("cargo:rerun-if-changed=cpp/native_window.cpp");+ println!("cargo:rerun-if-changed=cpp/video_view.h");+ println!("cargo:rerun-if-changed=cpp/video_view.cpp");}diff --cc desktop/app/src/main.rsindex 89b820e,f7c1c13..24e20ea--- a/desktop/app/src/main.rs+++ b/desktop/app/src/main.rs@@@ -58,9 -58,9 +58,12 @@@ mod updatermod webcam;#[cfg(windows)]mod win;+#[cfg(target_os = "linux")]+#[path = "linux/mod.rs"]+mod win;+ #[cfg(target_os = "macos")]+ #[path = "mac/mod.rs"]+ mod win;use std::{path::{Path, PathBuf},