From ee7b22c0605d6ab908936172397b412cf5c77dcc Mon Sep 17 00:00:00 2001 From: Ruijie Shi Date: Wed, 6 May 2026 16:30:14 -0700 Subject: [PATCH] Address build break under MinGW --- Extensions/DirectXMathAVX.h | 4 ++-- Extensions/DirectXMathAVX2.h | 6 +++--- Extensions/DirectXMathBE.h | 4 ++-- Extensions/DirectXMathF16C.h | 4 ++-- Extensions/DirectXMathFMA3.h | 4 ++-- Extensions/DirectXMathFMA4.h | 8 ++++---- Extensions/DirectXMathSSE3.h | 4 ++-- Extensions/DirectXMathSSE4.h | 4 ++-- Inc/DirectXMathMisc.inl | 6 +++--- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Extensions/DirectXMathAVX.h b/Extensions/DirectXMathAVX.h index ace043b..964a9a4 100644 --- a/Extensions/DirectXMathAVX.h +++ b/Extensions/DirectXMathAVX.h @@ -28,7 +28,7 @@ namespace DirectX // See https://msdn.microsoft.com/en-us/library/hskdteyh.aspx int CPUInfo[4] = { -1 }; - #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) + #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) && !defined(__MINGW32__) __cpuid(0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]); #else __cpuid(CPUInfo, 0); @@ -37,7 +37,7 @@ namespace DirectX if (CPUInfo[0] < 1) return false; - #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) + #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) && !defined(__MINGW32__) __cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]); #else __cpuid(CPUInfo, 1); diff --git a/Extensions/DirectXMathAVX2.h b/Extensions/DirectXMathAVX2.h index c149762..3ee8806 100644 --- a/Extensions/DirectXMathAVX2.h +++ b/Extensions/DirectXMathAVX2.h @@ -29,7 +29,7 @@ namespace DirectX // See https://msdn.microsoft.com/en-us/library/hskdteyh.aspx int CPUInfo[4] = { -1 }; - #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) + #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) && !defined(__MINGW32__) __cpuid(0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]); #else __cpuid(CPUInfo, 0); @@ -38,7 +38,7 @@ namespace DirectX if (CPUInfo[0] < 7) return false; - #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) + #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) && !defined(__MINGW32__) __cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]); #else __cpuid(CPUInfo, 1); @@ -48,7 +48,7 @@ namespace DirectX if ((CPUInfo[2] & 0x38081001) != 0x38081001) return false; - #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) + #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) && !defined(__MINGW32__) __cpuid_count(7, 0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]); #else __cpuidex(CPUInfo, 7, 0); diff --git a/Extensions/DirectXMathBE.h b/Extensions/DirectXMathBE.h index 4e30a18..68d7aee 100644 --- a/Extensions/DirectXMathBE.h +++ b/Extensions/DirectXMathBE.h @@ -59,7 +59,7 @@ namespace DirectX // See https://msdn.microsoft.com/en-us/library/hskdteyh.aspx int CPUInfo[4] = { -1 }; - #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) + #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) && !defined(__MINGW32__) __cpuid(0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]); #else __cpuid(CPUInfo, 0); @@ -68,7 +68,7 @@ namespace DirectX if (CPUInfo[0] < 1) return false; - #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) + #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) && !defined(__MINGW32__) __cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]); #else __cpuid(CPUInfo, 1); diff --git a/Extensions/DirectXMathF16C.h b/Extensions/DirectXMathF16C.h index 80a1c5e..cf0995d 100644 --- a/Extensions/DirectXMathF16C.h +++ b/Extensions/DirectXMathF16C.h @@ -29,7 +29,7 @@ namespace DirectX // See https://msdn.microsoft.com/en-us/library/hskdteyh.aspx int CPUInfo[4] = { -1 }; - #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) + #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) && !defined(__MINGW32__) __cpuid(0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]); #else __cpuid(CPUInfo, 0); @@ -38,7 +38,7 @@ namespace DirectX if (CPUInfo[0] < 1) return false; - #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) + #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) && !defined(__MINGW32__) __cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]); #else __cpuid(CPUInfo, 1); diff --git a/Extensions/DirectXMathFMA3.h b/Extensions/DirectXMathFMA3.h index db24bc3..a991d3f 100644 --- a/Extensions/DirectXMathFMA3.h +++ b/Extensions/DirectXMathFMA3.h @@ -28,7 +28,7 @@ namespace DirectX // See https://msdn.microsoft.com/en-us/library/hskdteyh.aspx int CPUInfo[4] = { -1 }; - #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) + #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) && !defined(__MINGW32__) __cpuid(0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]); #else __cpuid(CPUInfo, 0); @@ -37,7 +37,7 @@ namespace DirectX if (CPUInfo[0] < 1) return false; - #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) + #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) && !defined(__MINGW32__) __cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]); #else __cpuid(CPUInfo, 1); diff --git a/Extensions/DirectXMathFMA4.h b/Extensions/DirectXMathFMA4.h index 1fc15c4..c6394fa 100644 --- a/Extensions/DirectXMathFMA4.h +++ b/Extensions/DirectXMathFMA4.h @@ -33,7 +33,7 @@ namespace DirectX // See https://msdn.microsoft.com/en-us/library/hskdteyh.aspx int CPUInfo[4] = { -1 }; - #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) + #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) && !defined(__MINGW32__) __cpuid(0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]); #else __cpuid(CPUInfo, 0); @@ -42,7 +42,7 @@ namespace DirectX if (CPUInfo[0] < 1) return false; - #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) + #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) && !defined(__MINGW32__) __cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]); #else __cpuid(CPUInfo, 1); @@ -52,7 +52,7 @@ namespace DirectX if ((CPUInfo[2] & 0x18000000) != 0x18000000) return false; - #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) + #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) && !defined(__MINGW32__) __cpuid(0x80000000, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]); #else __cpuid(CPUInfo, static_cast(0x80000000)); @@ -62,7 +62,7 @@ namespace DirectX return false; // We check for FMA4 - #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) + #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) && !defined(__MINGW32__) __cpuid(0x80000001, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]); #else __cpuid(CPUInfo, static_cast(0x80000001)); diff --git a/Extensions/DirectXMathSSE3.h b/Extensions/DirectXMathSSE3.h index 1e57916..667d1d9 100644 --- a/Extensions/DirectXMathSSE3.h +++ b/Extensions/DirectXMathSSE3.h @@ -29,7 +29,7 @@ namespace DirectX // See https://msdn.microsoft.com/en-us/library/hskdteyh.aspx int CPUInfo[4] = { -1 }; - #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) + #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) && !defined(__MINGW32__) __cpuid(0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]); #else __cpuid(CPUInfo, 0); @@ -37,7 +37,7 @@ namespace DirectX if (CPUInfo[0] < 1) return false; - #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) + #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) && !defined(__MINGW32__) __cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]); #else __cpuid(CPUInfo, 1); diff --git a/Extensions/DirectXMathSSE4.h b/Extensions/DirectXMathSSE4.h index 5c51131..c20eafd 100644 --- a/Extensions/DirectXMathSSE4.h +++ b/Extensions/DirectXMathSSE4.h @@ -29,7 +29,7 @@ namespace DirectX // See https://msdn.microsoft.com/en-us/library/hskdteyh.aspx int CPUInfo[4] = { -1 }; - #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) + #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) && !defined(__MINGW32__) __cpuid(0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]); #else __cpuid(CPUInfo, 0); @@ -37,7 +37,7 @@ namespace DirectX if (CPUInfo[0] < 1) return false; - #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) + #if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) && !defined(__MINGW32__) __cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]); #else __cpuid(CPUInfo, 1); diff --git a/Inc/DirectXMathMisc.inl b/Inc/DirectXMathMisc.inl index 49c449b..d798104 100644 --- a/Inc/DirectXMathMisc.inl +++ b/Inc/DirectXMathMisc.inl @@ -1973,7 +1973,7 @@ inline bool XMVerifyCPUSupport() noexcept { #if defined(_XM_SSE_INTRINSICS_) && !defined(__powerpc64__) && !defined(_XM_NO_INTRINSICS_) int CPUInfo[4] = { -1 }; -#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) +#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) && !defined(__MINGW32__) __cpuid(0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]); #else __cpuid(CPUInfo, 0); @@ -1987,7 +1987,7 @@ inline bool XMVerifyCPUSupport() noexcept return false; #endif -#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) +#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) && !defined(__MINGW32__) __cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]); #else __cpuid(CPUInfo, 1); @@ -2022,7 +2022,7 @@ inline bool XMVerifyCPUSupport() noexcept return false; // No SSE2/SSE support #if defined(__AVX2__) || defined(_XM_AVX2_INTRINSICS_) -#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) +#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER) && !defined(__MINGW32__) __cpuid_count(7, 0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]); #else __cpuidex(CPUInfo, 7, 0);