[OMPT-svn-commit] OpenMPT r24461 - in branches/OpenMPT-1.31: . include/cryptopp

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

Author: manx
Date: Thu Nov 13 18:11:12 2025
New Revision: 24461
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=24461

Log:
Merged revision(s) 24459 from trunk/OpenMPT:
[Fix] Crypto++: Fix ARM64 build.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/include/cryptopp/OpenMPT.txt
   branches/OpenMPT-1.31/include/cryptopp/config_asm.h

Modified: branches/OpenMPT-1.31/include/cryptopp/OpenMPT.txt
==============================================================================
--- branches/OpenMPT-1.31/include/cryptopp/OpenMPT.txt	Thu Nov 13 18:10:50 2025	(r24460)
+++ branches/OpenMPT-1.31/include/cryptopp/OpenMPT.txt	Thu Nov 13 18:11:12 2025	(r24461)
@@ -2,6 +2,9 @@
 The following changes have been made:
  *  Commit <https://github.com/weidai11/cryptopp/commit/121014baf0e8> has been
     applied to fix <https://github.com/weidai11/cryptopp/issues/1240>.
+ *  `#define CRYPTOPP_ARM_ACLE_HEADER 1` in `config_asm.h` has been disabled if
+    ´_MSC_VER` is defined.
+ *  Modifications are marked with `  // OpenMPT`.
  *  Obviously, unnecessary folders and files have been removed.
  *  For building, premake is used to generate Visual Studio project files.
     See ../build/premake/ for details.

Modified: branches/OpenMPT-1.31/include/cryptopp/config_asm.h
==============================================================================
--- branches/OpenMPT-1.31/include/cryptopp/config_asm.h	Thu Nov 13 18:10:50 2025	(r24460)
+++ branches/OpenMPT-1.31/include/cryptopp/config_asm.h	Thu Nov 13 18:11:12 2025	(r24461)
@@ -353,6 +353,8 @@
 // Limit the <arm_acle.h> include.
 #if !defined(CRYPTOPP_ARM_ACLE_HEADER)
 # if defined(__aarch32__) || defined(__aarch64__) || (__ARM_ARCH >= 8) || defined(__ARM_ACLE)
+# endif  // OpenMPT
+# if (defined(__aarch32__) || defined(__aarch64__) || (__ARM_ARCH >= 8) || defined(__ARM_ACLE)) && !defined(_MSC_VER)  // OpenMPT
 #  define CRYPTOPP_ARM_ACLE_HEADER 1
 # endif
 #endif