diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-06-07 23:29:32 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-06-07 23:29:32 +0200 |
| commit | 688f9561dc92137cefabe1e4fb30818cf62d076c (patch) | |
| tree | 89385490cf1d8e1829c6d583c7060e8f7a8096b7 /thirdparty | |
| parent | 1ee953030ec46402c88d5d655c8e741c7160d7f9 (diff) | |
| parent | 093718899f44cc2523b1096b7ad2363114f63492 (diff) | |
| download | redot-engine-688f9561dc92137cefabe1e4fb30818cf62d076c.tar.gz | |
Merge pull request #92488 from TCROC/fix-cpuidex-mingw
Fix use of undeclared identifier `__cpuidex` error on MinGW
Diffstat (limited to 'thirdparty')
| -rw-r--r-- | thirdparty/embree/common/sys/sysinfo.cpp | 2 | ||||
| -rw-r--r-- | thirdparty/embree/patches/mingw-no-cpuidex.patch | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/thirdparty/embree/common/sys/sysinfo.cpp b/thirdparty/embree/common/sys/sysinfo.cpp index d01eab3c9d..4ecab05265 100644 --- a/thirdparty/embree/common/sys/sysinfo.cpp +++ b/thirdparty/embree/common/sys/sysinfo.cpp @@ -295,7 +295,7 @@ namespace embree if (nIds >= 1) __cpuid (cpuid_leaf_1,0x00000001); #if _WIN32 #if _MSC_VER && (_MSC_FULL_VER < 160040219) -#else +#elif defined(_MSC_VER) if (nIds >= 7) __cpuidex(cpuid_leaf_7,0x00000007,0); #endif #else diff --git a/thirdparty/embree/patches/mingw-no-cpuidex.patch b/thirdparty/embree/patches/mingw-no-cpuidex.patch new file mode 100644 index 0000000000..5480334ceb --- /dev/null +++ b/thirdparty/embree/patches/mingw-no-cpuidex.patch @@ -0,0 +1,13 @@ +diff --git a/thirdparty/embree/common/sys/sysinfo.cpp b/thirdparty/embree/common/sys/sysinfo.cpp +index d01eab3c9d..4ecab05265 100644 +--- a/thirdparty/embree/common/sys/sysinfo.cpp ++++ b/thirdparty/embree/common/sys/sysinfo.cpp +@@ -295,7 +295,7 @@ namespace embree + if (nIds >= 1) __cpuid (cpuid_leaf_1,0x00000001); + #if _WIN32 + #if _MSC_VER && (_MSC_FULL_VER < 160040219) +-#else ++#elif defined(_MSC_VER) + if (nIds >= 7) __cpuidex(cpuid_leaf_7,0x00000007,0); + #endif + #else |