mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-01 01:19:16 +08:00
cb1301e997
* [libzen] Update, fix pkgconfig * [libmediainfo] Update, fix dependencies * [libzen] Restore package name * [libmediainfo] Fix dependencies * Fix pkgconfig * [libmediainfo] Patch out local windows namespace * [libmediainfo] Update to 23.04
26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
diff --git a/Source/ThirdParty/aes-gladman/aesopt.h b/Source/ThirdParty/aes-gladman/aesopt.h
|
|
index d3ac0f9..eeefa40 100644
|
|
--- a/Source/ThirdParty/aes-gladman/aesopt.h
|
|
+++ b/Source/ThirdParty/aes-gladman/aesopt.h
|
|
@@ -183,7 +183,7 @@ Issue Date: 20/12/2007
|
|
AES_REV_DKS must NOT be defined when such assembler files are
|
|
built
|
|
*/
|
|
-#if 1 && defined( _WIN64 ) && defined( _MSC_VER )
|
|
+#if 1 && defined( _WIN64 ) && defined( _MSC_VER ) && defined( _M_AMD64 )
|
|
# define INTEL_AES_POSSIBLE
|
|
#endif
|
|
|
|
diff --git a/Source/ThirdParty/aes-gladman/brg_endian.h b/Source/ThirdParty/aes-gladman/brg_endian.h
|
|
index b44c5cb..6ba31c1 100644
|
|
--- a/Source/ThirdParty/aes-gladman/brg_endian.h
|
|
+++ b/Source/ThirdParty/aes-gladman/brg_endian.h
|
|
@@ -101,6 +101,7 @@ Issue Date: 20/12/2007
|
|
defined( __i386__ ) || defined( _M_I86 ) || defined( _M_IX86 ) || \
|
|
defined( __OS2__ ) || defined( sun386 ) || defined( __TURBOC__ ) || \
|
|
defined( vax ) || defined( vms ) || defined( VMS ) || \
|
|
+ defined( _M_ARM64 ) || defined ( _M_ARM ) || \
|
|
defined( __VMS ) || defined( _M_X64 )
|
|
# define PLATFORM_BYTE_ORDER IS_LITTLE_ENDIAN
|
|
|