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>
46 lines
1.2 KiB
Makefile
46 lines
1.2 KiB
Makefile
## Process this file with automake to produce Makefile.in
|
|
|
|
DOCINPUTS = $(top_srcdir)/include/opus.h \
|
|
$(top_srcdir)/include/opus_multistream.h \
|
|
$(top_srcdir)/include/opus_defines.h \
|
|
$(top_srcdir)/include/opus_types.h \
|
|
$(top_srcdir)/include/opus_custom.h \
|
|
$(top_srcdir)/doc/header.html \
|
|
$(top_srcdir)/doc/footer.html \
|
|
$(top_srcdir)/doc/customdoxygen.css
|
|
|
|
EXTRA_DIST = customdoxygen.css Doxyfile.in footer.html header.html \
|
|
opus_logo.svg trivial_example.c
|
|
|
|
|
|
if HAVE_DOXYGEN
|
|
|
|
all-local: doxygen-build.stamp
|
|
|
|
doxygen-build.stamp: Doxyfile $(DOCINPUTS)
|
|
doxygen
|
|
touch $@
|
|
|
|
install-data-local:
|
|
$(INSTALL) -d $(DESTDIR)$(docdir)/html/search
|
|
for f in `find html -type f \! -name "installdox"`; do \
|
|
$(INSTALL_DATA) $$f $(DESTDIR)$(docdir)/$$f; \
|
|
done
|
|
|
|
$(INSTALL) -d $(DESTDIR)$(mandir)/man3
|
|
cd man && find man3 -type f -name opus_*.3 \
|
|
-exec $(INSTALL_DATA) \{} $(DESTDIR)$(mandir)/man3 \;
|
|
|
|
clean-local:
|
|
$(RM) -r html
|
|
$(RM) -r latex
|
|
$(RM) -r man
|
|
$(RM) doxygen-build.stamp
|
|
$(RM) doxygen_sqlite3.db
|
|
|
|
uninstall-local:
|
|
$(RM) -r $(DESTDIR)$(docdir)/html
|
|
$(RM) $(DESTDIR)$(mandir)/man3/opus_*.3 $(DESTDIR)$(mandir)/man3/opus.h.3
|
|
|
|
endif
|