Merged revision(s) 22844 from trunk/OpenMPT:

[Fix] Opus: Fix build for ARM64EC. ........ git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.31@22846 56274372-70c3-4bfc-bfc3-4c3a0b034d27
OpenMPT · Jan 7, 2025 · 0799385 · 0799385
1 parent 18f1f1b
commit 0799385
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/include/opus/OpenMPT.txt b/include/opus/OpenMPT.txt
@@ -1,6 +1,7 @@
 libopus library version 1.5.2 (2024-04-12).
 The following changes have been made:
  *  Obviously, unnecessary folders and files have been removed.
+ *  celt/float_cast.h has been modified to compile on ARM64EC.
  *  celt/x86/vq_sse2.c has been modified to check for OPUS_X86_MAY_HAVE_SSE2.
  *  celt/x86/x86_arch_macros.c has been modified to support AVX and AVX2.
  *  A warning in dnn/dred_encoder.c has been silenced.

diff --git a/include/opus/celt/float_cast.h b/include/opus/celt/float_cast.h
@@ -69,6 +69,7 @@ static OPUS_INLINE opus_int32 float2int(float x) {return _mm_cvt_ss2si(_mm_set_s
 
 #elif (defined(_MSC_VER) && _MSC_VER >= 1400) && (defined(_M_X64) || (defined(_M_IX86_FP) && _M_IX86_FP >= 1))
 
+        #include <intrin.h>  /* OpenMPT */
         #include <xmmintrin.h>
         static OPUS_INLINE opus_int32 float2int(float value)
         {