From 4def0cb7d36ae4e8b390de908d3ee246ccd08fd9 Mon Sep 17 00:00:00 2001 From: "J. Peter Mugaas" Date: Fri, 2 Feb 2024 02:09:57 -0500 Subject: [PATCH] Fix for MINGW cpuid.h being called instead of intrin.h. (#176) --- Inc/DirectXMath.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Inc/DirectXMath.h b/Inc/DirectXMath.h index 6549d76..f072731 100644 --- a/Inc/DirectXMath.h +++ b/Inc/DirectXMath.h @@ -114,11 +114,15 @@ #pragma warning(push) #pragma warning(disable : 4987) // C4987: Off by default noise +#endif +#if defined(_MSC_VER) || defined(__MINGW32__) #include +#endif +#ifdef _MSC_VER #pragma warning(pop) #endif -#if (defined(__clang__) || defined(__GNUC__)) && (__x86_64__ || __i386__) +#if (defined(__clang__) || defined(__GNUC__)) && (__x86_64__ || __i386__) && !defined(__MINGW32__) #include #endif