[OMPT-svn-commit] OpenMPT r22994 - in branches/OpenMPT-1.30: . include/vorbis include/vorbis/lib

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

Author: manx
Date: Fri Mar  7 21:13:04 2025
New Revision: 22994
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22994

Log:
Merged revision(s) 21890, 21902 from trunk/OpenMPT:
[Fix] Vorbis: Fix ARM64EC build.
........
[Fix] Vorbis: r21890 broken non-MSVC SSE2 builds.
........

Modified:
   branches/OpenMPT-1.30/   (props changed)
   branches/OpenMPT-1.30/include/vorbis/OpenMPT.txt
   branches/OpenMPT-1.30/include/vorbis/lib/os.h

Modified: branches/OpenMPT-1.30/include/vorbis/OpenMPT.txt
==============================================================================
--- branches/OpenMPT-1.30/include/vorbis/OpenMPT.txt	Fri Mar  7 21:11:54 2025	(r22993)
+++ branches/OpenMPT-1.30/include/vorbis/OpenMPT.txt	Fri Mar  7 21:13:04 2025	(r22994)
@@ -6,6 +6,7 @@
 - https://github.com/xiph/vorbis/pull/100 and
   https://github.com/xiph/vorbis/pull/101 have been applied.
 - GCC warnings in lib/lpc.c and lib/psy.c have been silenced.
+- os.h has been modified to build for ARM64EC.
 - All modifications have been marked with /* OpenMPT */.
 - For building, premake is used to generate Visual Studio project files.
   See ../build/premake/ for details.

Modified: branches/OpenMPT-1.30/include/vorbis/lib/os.h
==============================================================================
--- branches/OpenMPT-1.30/include/vorbis/lib/os.h	Fri Mar  7 21:11:54 2025	(r22993)
+++ branches/OpenMPT-1.30/include/vorbis/lib/os.h	Fri Mar  7 21:13:04 2025	(r22994)
@@ -153,6 +153,9 @@
 
 typedef ogg_int16_t vorbis_fpu_control;
 
+#if defined(_MSC_VER)  /* OpenMPT */
+#include <intrin.h>  /* OpenMPT */
+#endif  /* OpenMPT */
 #include <emmintrin.h>
 static __inline int vorbis_ftoi(double f){
         return _mm_cvtsd_si32(_mm_load_sd(&f));