asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[3.x] Improve architectures in OS::has_feature and make it work on MSVC

Browse source
This commit is contained in:
Aaron Franke 2022-06-05 14:10:20 -05:00
parent ef8401edf5
commit 0470392930
No known key found for this signature in database
GPG key ID: 40A1750B977E56BF
1 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
core/os/os.cpp
View file

@ -668,19 +668,25 @@ bool OS::has_feature(const String &p_feature) {
if (sizeof(void *) == 4 && p_feature == "32") { if (sizeof(void *) == 4 && p_feature == "32") {
return true; return true;
} }
#if defined(__x86_64) || defined(__x86_64__) || defined(__amd64__) #if defined(__x86_64) || defined(__x86_64__) || defined(__amd64__) || defined(_M_X64)
if (p_feature == "x86_64") { if (p_feature == "x86_64") {
return true; return true;
} }
#elif (defined(__i386) || defined(__i386__)) #elif defined(__i386) || defined(__i386__) || defined(_M_IX86)
if (p_feature == "x86_32") {
return true;
}
if (p_feature == "x86") { if (p_feature == "x86") {
return true; return true;
} }
#elif defined(__aarch64__) #elif defined(__aarch64__) || defined(_M_ARM64)
if (p_feature == "arm64") { if (p_feature == "arm64") {
return true; return true;
} }
#elif defined(__arm__) #elif defined(__arm__) || defined(_M_ARM)
if (p_feature == "arm32") {
return true;
}
#if defined(__ARM_ARCH_7A__) #if defined(__ARM_ARCH_7A__)
if (p_feature == "armv7a" || p_feature == "armv7") { if (p_feature == "armv7a" || p_feature == "armv7") {
return true; return true;
@ -712,6 +718,19 @@ bool OS::has_feature(const String &p_feature) {
if (p_feature == "ppc") { if (p_feature == "ppc") {
return true; return true;
} }
#elif defined(__wasm__)
#if defined(__wasm64__)
if (p_feature == "wasm64") {
return true;
}
#elif defined(__wasm32__)
if (p_feature == "wasm32") {
return true;
}
#endif
if (p_feature == "wasm") {
return true;
}
#endif #endif
if (_check_internal_feature_support(p_feature)) { if (_check_internal_feature_support(p_feature)) {