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>
51 lines
887 B
Makefile
51 lines
887 B
Makefile
CELT_SOURCES = \
|
|
celt/bands.c \
|
|
celt/celt.c \
|
|
celt/celt_encoder.c \
|
|
celt/celt_decoder.c \
|
|
celt/cwrs.c \
|
|
celt/entcode.c \
|
|
celt/entdec.c \
|
|
celt/entenc.c \
|
|
celt/kiss_fft.c \
|
|
celt/laplace.c \
|
|
celt/mathops.c \
|
|
celt/mdct.c \
|
|
celt/modes.c \
|
|
celt/pitch.c \
|
|
celt/celt_lpc.c \
|
|
celt/quant_bands.c \
|
|
celt/rate.c \
|
|
celt/vq.c
|
|
|
|
CELT_SOURCES_SSE = \
|
|
celt/x86/x86cpu.c \
|
|
celt/x86/x86_celt_map.c \
|
|
celt/x86/pitch_sse.c
|
|
|
|
CELT_SOURCES_SSE2 = \
|
|
celt/x86/pitch_sse2.c \
|
|
celt/x86/vq_sse2.c
|
|
|
|
CELT_SOURCES_SSE4_1 = \
|
|
celt/x86/celt_lpc_sse4_1.c \
|
|
celt/x86/pitch_sse4_1.c
|
|
|
|
CELT_SOURCES_ARM = \
|
|
celt/arm/armcpu.c \
|
|
celt/arm/arm_celt_map.c
|
|
|
|
CELT_SOURCES_ARM_ASM = \
|
|
celt/arm/celt_pitch_xcorr_arm.s
|
|
|
|
CELT_AM_SOURCES_ARM_ASM = \
|
|
celt/arm/armopts.s.in
|
|
|
|
CELT_SOURCES_ARM_NEON_INTR = \
|
|
celt/arm/celt_neon_intr.c \
|
|
celt/arm/pitch_neon_intr.c
|
|
|
|
CELT_SOURCES_ARM_NE10 = \
|
|
celt/arm/celt_fft_ne10.c \
|
|
celt/arm/celt_mdct_ne10.c
|