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>
64 lines
1.9 KiB
Meson
64 lines
1.9 KiB
Meson
celt_sources = sources['CELT_SOURCES']
|
|
|
|
celt_sse_sources = sources['CELT_SOURCES_SSE']
|
|
|
|
celt_sse2_sources = sources['CELT_SOURCES_SSE2']
|
|
|
|
celt_sse4_1_sources = sources['CELT_SOURCES_SSE4_1']
|
|
|
|
celt_neon_intr_sources = sources['CELT_SOURCES_ARM_NEON_INTR']
|
|
|
|
celt_static_libs = []
|
|
|
|
foreach intr_name : ['sse', 'sse2', 'sse4_1', 'neon_intr']
|
|
have_intr = get_variable('have_' + intr_name)
|
|
if not have_intr
|
|
continue
|
|
endif
|
|
|
|
intr_sources = get_variable('celt_@0@_sources'.format(intr_name))
|
|
intr_args = get_variable('opus_@0@_args'.format(intr_name), [])
|
|
celt_static_libs += static_library('celt_' + intr_name, intr_sources,
|
|
c_args: intr_args,
|
|
include_directories: opus_includes,
|
|
install: false)
|
|
endforeach
|
|
|
|
have_arm_intrinsics_or_asm = have_arm_ne10
|
|
if (intrinsics_support.length() + asm_optimization.length() + inline_optimization.length()) > 0
|
|
have_arm_intrinsics_or_asm = true
|
|
endif
|
|
|
|
if host_cpu_family in ['arm', 'aarch64'] and have_arm_intrinsics_or_asm
|
|
celt_sources += sources['CELT_SOURCES_ARM']
|
|
if have_arm_ne10
|
|
celt_sources += sources['CELT_SOURCES_ARM_NE10']
|
|
endif
|
|
if opus_arm_external_asm
|
|
arm2gnu = [find_program('arm/arm2gnu.pl')] + arm2gnu_args
|
|
celt_sources_arm_asm = configure_file(input: 'arm/celt_pitch_xcorr_arm.s',
|
|
output: '@BASENAME@-gnu.S',
|
|
command: arm2gnu + ['@INPUT@'],
|
|
capture: true)
|
|
celt_arm_armopts_s = configure_file(input: 'arm/armopts.s.in',
|
|
output: 'arm/armopts.s',
|
|
configuration: opus_conf)
|
|
celt_static_libs += static_library('celt-armasm',
|
|
celt_arm_armopts_s, celt_sources_arm_asm,
|
|
install: false)
|
|
endif
|
|
endif
|
|
|
|
celt_c_args = []
|
|
if host_system == 'windows'
|
|
celt_c_args += ['-DDLL_EXPORT']
|
|
endif
|
|
|
|
celt_lib = static_library('opus-celt',
|
|
celt_sources,
|
|
c_args: celt_c_args,
|
|
include_directories: opus_includes,
|
|
link_whole: celt_static_libs,
|
|
dependencies: libm,
|
|
install: false)
|