[OMPT-svn-commit] OpenMPT r21886 - in branches/OpenMPT-1.31: . common

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

Author: manx
Date: Sun Oct 20 14:56:57 2024
New Revision: 21886
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21886

Log:
Merged revision(s) 21884 from trunk/OpenMPT:
[Fix] BuildSettings: Do not use x86 intrinsics on ARM64EC.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/common/BuildSettings.h

Modified: branches/OpenMPT-1.31/common/BuildSettings.h
==============================================================================
--- branches/OpenMPT-1.31/common/BuildSettings.h	Sun Oct 20 14:56:35 2024	(r21885)
+++ branches/OpenMPT-1.31/common/BuildSettings.h	Sun Oct 20 14:56:57 2024	(r21886)
@@ -16,6 +16,7 @@
 
 
 
+#include "mpt/base/detect_arch.hpp"
 #include "mpt/base/detect_compiler.hpp"
 #include "mpt/base/detect_os.hpp"
 #include "mpt/base/detect_quirks.hpp"
@@ -225,14 +226,14 @@
 #endif
 
 #if defined(MPT_ENABLE_ARCH_INTRINSICS)
-#if MPT_COMPILER_MSVC && defined(_M_IX86)
+#if MPT_COMPILER_MSVC && MPT_ARCH_X86
 
 #define MPT_ENABLE_ARCH_X86
 
 #define MPT_ENABLE_ARCH_INTRINSICS_SSE
 #define MPT_ENABLE_ARCH_INTRINSICS_SSE2
 
-#elif MPT_COMPILER_MSVC && defined(_M_X64)
+#elif MPT_COMPILER_MSVC && MPT_ARCH_AMD64
 
 #define MPT_ENABLE_ARCH_AMD64