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>
47 lines
2.3 KiB
CMake
47 lines
2.3 KiB
CMake
if(__opus_sources)
|
|
return()
|
|
endif()
|
|
set(__opus_sources INCLUDED)
|
|
|
|
include(OpusFunctions)
|
|
|
|
get_opus_sources(SILK_HEAD silk_headers.mk silk_headers)
|
|
get_opus_sources(SILK_SOURCES silk_sources.mk silk_sources)
|
|
get_opus_sources(SILK_SOURCES_FLOAT silk_sources.mk silk_sources_float)
|
|
get_opus_sources(SILK_SOURCES_FIXED silk_sources.mk silk_sources_fixed)
|
|
get_opus_sources(SILK_SOURCES_SSE4_1 silk_sources.mk silk_sources_sse4_1)
|
|
get_opus_sources(SILK_SOURCES_FIXED_SSE4_1 silk_sources.mk
|
|
silk_sources_fixed_sse4_1)
|
|
get_opus_sources(SILK_SOURCES_ARM_NEON_INTR silk_sources.mk
|
|
silk_sources_arm_neon_intr)
|
|
get_opus_sources(SILK_SOURCES_FIXED_ARM_NEON_INTR silk_sources.mk
|
|
silk_sources_fixed_arm_neon_intr)
|
|
|
|
get_opus_sources(OPUS_HEAD opus_headers.mk opus_headers)
|
|
get_opus_sources(OPUS_SOURCES opus_sources.mk opus_sources)
|
|
get_opus_sources(OPUS_SOURCES_FLOAT opus_sources.mk opus_sources_float)
|
|
|
|
get_opus_sources(CELT_HEAD celt_headers.mk celt_headers)
|
|
get_opus_sources(CELT_SOURCES celt_sources.mk celt_sources)
|
|
get_opus_sources(CELT_SOURCES_SSE celt_sources.mk celt_sources_sse)
|
|
get_opus_sources(CELT_SOURCES_SSE2 celt_sources.mk celt_sources_sse2)
|
|
get_opus_sources(CELT_SOURCES_SSE4_1 celt_sources.mk celt_sources_sse4_1)
|
|
get_opus_sources(CELT_SOURCES_ARM celt_sources.mk celt_sources_arm)
|
|
get_opus_sources(CELT_SOURCES_ARM_ASM celt_sources.mk celt_sources_arm_asm)
|
|
get_opus_sources(CELT_AM_SOURCES_ARM_ASM celt_sources.mk
|
|
celt_am_sources_arm_asm)
|
|
get_opus_sources(CELT_SOURCES_ARM_NEON_INTR celt_sources.mk
|
|
celt_sources_arm_neon_intr)
|
|
get_opus_sources(CELT_SOURCES_ARM_NE10 celt_sources.mk celt_sources_arm_ne10)
|
|
|
|
get_opus_sources(opus_demo_SOURCES Makefile.am opus_demo_sources)
|
|
get_opus_sources(opus_custom_demo_SOURCES Makefile.am opus_custom_demo_sources)
|
|
get_opus_sources(opus_compare_SOURCES Makefile.am opus_compare_sources)
|
|
get_opus_sources(tests_test_opus_api_SOURCES Makefile.am test_opus_api_sources)
|
|
get_opus_sources(tests_test_opus_encode_SOURCES Makefile.am
|
|
test_opus_encode_sources)
|
|
get_opus_sources(tests_test_opus_decode_SOURCES Makefile.am
|
|
test_opus_decode_sources)
|
|
get_opus_sources(tests_test_opus_padding_SOURCES Makefile.am
|
|
test_opus_padding_sources)
|