[OMPT-svn-commit] OpenMPT r22846 - in branches/OpenMPT-1.31: . include/opus include/opus/celt

[<sv...@op...>]

Author: manx
Date: Tue Jan  7 16:25:07 2025
New Revision: 22846
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22846

Log:
Merged revision(s) 22844 from trunk/OpenMPT:
[Fix] Opus: Fix build for ARM64EC.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/include/opus/OpenMPT.txt
   branches/OpenMPT-1.31/include/opus/celt/float_cast.h

Modified: branches/OpenMPT-1.31/include/opus/OpenMPT.txt
==============================================================================
--- branches/OpenMPT-1.31/include/opus/OpenMPT.txt	Tue Jan  7 16:24:34 2025	(r22845)
+++ branches/OpenMPT-1.31/include/opus/OpenMPT.txt	Tue Jan  7 16:25:07 2025	(r22846)
@@ -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.

Modified: branches/OpenMPT-1.31/include/opus/celt/float_cast.h
==============================================================================
--- branches/OpenMPT-1.31/include/opus/celt/float_cast.h	Tue Jan  7 16:24:34 2025	(r22845)
+++ branches/OpenMPT-1.31/include/opus/celt/float_cast.h	Tue Jan  7 16:25:07 2025	(r22846)
@@ -69,6 +69,7 @@
 
 #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)
         {