mirror of
https://github.com/godotengine/godot
synced 2024-09-05 19:59:37 +00:00
Merge pull request #92488 from TCROC/fix-cpuidex-mingw
Fix use of undeclared identifier `__cpuidex` error on MinGW
This commit is contained in:
commit
688f9561dc
2
thirdparty/embree/common/sys/sysinfo.cpp
vendored
2
thirdparty/embree/common/sys/sysinfo.cpp
vendored
|
@ -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
|
||||
|
|
13
thirdparty/embree/patches/mingw-no-cpuidex.patch
vendored
Normal file
13
thirdparty/embree/patches/mingw-no-cpuidex.patch
vendored
Normal file
|
@ -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
|
Loading…
Reference in a new issue