0683dde5d3
cargo-xwin drives the Windows MSVC cross-compile via clang-cl, under which CMake sets MSVC=1 — causing libopus 1.3.1's `if(NOT MSVC)` guards to skip the per-file `-msse4.1` / `-mssse3` COMPILE_FLAGS that its x86 SIMD source files need. Clang-cl (unlike real cl.exe) still honors Clang's target-feature system, so those files then fail to compile with "always_inline function '_mm_cvtepi16_epi32' requires target feature 'sse4.1'" errors across silk/NSQ_sse4_1.c, NSQ_del_dec_sse4_1.c, and VQ_WMat_EC_sse4_1.c. Earlier attempts to fix this downstream (cargo-xwin toolchain file, override.cmake CMAKE_C_COMPILE_OBJECT <FLAGS> replace, CFLAGS env vars) all failed because cargo-xwin rewrites override.cmake from scratch on every `cargo xwin build` invocation and cmake-rs's -DCMAKE_C_FLAGS= assembly happens before toolchain FORCE sets propagate. Fixing it upstream at the source: vendor audiopus_sys 0.2.2 into vendor/audiopus_sys, patch its bundled opus/CMakeLists.txt to introduce an MSVC_CL var (true only when CMAKE_C_COMPILER_ID == "MSVC", i.e. real cl.exe), and flip the eight `if(NOT MSVC)` SIMD guards to `if(NOT MSVC_CL)`. Clang-cl then gets the GCC-style per-file flags and the SSE4.1 sources build cleanly. Also flip the `if(MSVC)` global /arch block at line 445 to `if(MSVC_CL)` so only cl.exe applies /arch:AVX and clang-cl relies purely on per-file flags (no global/per-file mixing). Wire via [patch.crates-io] in the workspace root Cargo.toml; the patch is resolved relative to the workspace root as `vendor/audiopus_sys`. Upstream context: xiph/opus#256, xiph/opus PR #257 (both stale). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
92 lines
2.5 KiB
TOML
92 lines
2.5 KiB
TOML
[workspace]
|
|
resolver = "2"
|
|
members = [
|
|
"crates/wzp-proto",
|
|
"crates/wzp-codec",
|
|
"crates/wzp-fec",
|
|
"crates/wzp-crypto",
|
|
"crates/wzp-transport",
|
|
"crates/wzp-relay",
|
|
"crates/wzp-client",
|
|
"crates/wzp-web",
|
|
"crates/wzp-android",
|
|
"crates/wzp-native",
|
|
"desktop/src-tauri",
|
|
]
|
|
|
|
[workspace.package]
|
|
version = "0.1.0"
|
|
edition = "2024"
|
|
license = "MIT OR Apache-2.0"
|
|
rust-version = "1.85"
|
|
|
|
[workspace.dependencies]
|
|
# Shared
|
|
bytes = "1"
|
|
thiserror = "2"
|
|
async-trait = "0.1"
|
|
tokio = { version = "1", features = ["full"] }
|
|
tracing = "0.1"
|
|
tracing-subscriber = "0.3"
|
|
serde = { version = "1", features = ["derive"] }
|
|
|
|
# Transport
|
|
quinn = "0.11"
|
|
|
|
# FEC
|
|
raptorq = "2"
|
|
|
|
# Codec
|
|
audiopus = "0.3.0-rc.0"
|
|
codec2 = "0.3"
|
|
|
|
# Crypto
|
|
x25519-dalek = { version = "2", features = ["static_secrets"] }
|
|
ed25519-dalek = { version = "2", features = ["rand_core", "pkcs8"] }
|
|
chacha20poly1305 = "0.10"
|
|
hkdf = "0.12"
|
|
sha2 = "0.10"
|
|
rand = "0.8"
|
|
|
|
# Workspace crates
|
|
wzp-proto = { path = "crates/wzp-proto" }
|
|
wzp-codec = { path = "crates/wzp-codec" }
|
|
wzp-fec = { path = "crates/wzp-fec" }
|
|
wzp-crypto = { path = "crates/wzp-crypto" }
|
|
wzp-transport = { path = "crates/wzp-transport" }
|
|
wzp-client = { path = "crates/wzp-client" }
|
|
|
|
# Fast dev profile: optimized but with debug info and incremental compilation.
|
|
# Use with: cargo run --profile dev-fast
|
|
[profile.dev-fast]
|
|
inherits = "dev"
|
|
opt-level = 2
|
|
|
|
# Optimize heavy compute deps even in debug builds —
|
|
# real-time audio needs < 20ms per frame, impossible unoptimized.
|
|
[profile.dev.package.nnnoiseless]
|
|
opt-level = 3
|
|
[profile.dev.package.audiopus_sys]
|
|
opt-level = 3
|
|
[profile.dev.package.audiopus]
|
|
opt-level = 3
|
|
[profile.dev.package.raptorq]
|
|
opt-level = 3
|
|
[profile.dev.package.wzp-codec]
|
|
opt-level = 3
|
|
[profile.dev.package.wzp-fec]
|
|
opt-level = 3
|
|
|
|
# Vendored audiopus_sys with a patched opus/CMakeLists.txt that distinguishes
|
|
# real cl.exe (MSVC) from clang-cl (used by cargo-xwin for Windows cross-
|
|
# compiles). Upstream libopus 1.3.1 gates its `-msse4.1` per-file compile
|
|
# flags on `if(NOT MSVC)`, which is false under clang-cl because CMake sets
|
|
# MSVC=1 for both compilers — resulting in SSE4.1 source files compiled
|
|
# without the required target feature and hard failures in silk/NSQ_sse4_1.c.
|
|
# The vendored copy introduces an `MSVC_CL` var (true only for real cl.exe)
|
|
# and flips the SIMD guards to use it, restoring per-file SIMD flags for
|
|
# clang-cl. See vendor/audiopus_sys/opus/CMakeLists.txt for the full diff
|
|
# and rationale, plus xiph/opus#256 / xiph/opus PR #257 upstream.
|
|
[patch.crates-io]
|
|
audiopus_sys = { path = "vendor/audiopus_sys" }
|