diff options
| author | George L. Albany <Megacake1234@gmail.com> | 2024-11-11 16:19:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-11 16:19:19 +0000 |
| commit | 5094c2a5f7d506b0e685120f14d1df42e1e9d495 (patch) | |
| tree | a10abf56ba93705731da1aaf338f2cf21403c6ad /core/os/os.cpp | |
| parent | e7894c2c4efdd51049a21af4892005381fe57cd6 (diff) | |
| parent | 62fbec9f6f0722a1f9825c17f073742932082228 (diff) | |
| download | redot-engine-5094c2a5f7d506b0e685120f14d1df42e1e9d495.tar.gz | |
Merge pull request #853 from Spartan322/merge/0f5f3bc
Merge commit godotengine/godot@0f5f3bc
Diffstat (limited to 'core/os/os.cpp')
| -rw-r--r-- | core/os/os.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/core/os/os.cpp b/core/os/os.cpp index b41ea0a87f..4b599c70ee 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -441,6 +441,11 @@ bool OS::has_feature(const String &p_feature) { } #if defined(__x86_64) || defined(__x86_64__) || defined(__amd64__) || defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(_M_X64) #if defined(__x86_64) || defined(__x86_64__) || defined(__amd64__) || defined(_M_X64) +#if defined(MACOS_ENABLED) + if (p_feature == "universal") { + return true; + } +#endif if (p_feature == "x86_64") { return true; } @@ -454,6 +459,11 @@ bool OS::has_feature(const String &p_feature) { } #elif defined(__arm__) || defined(__aarch64__) || defined(_M_ARM) || defined(_M_ARM64) #if defined(__aarch64__) || defined(_M_ARM64) +#if defined(MACOS_ENABLED) + if (p_feature == "universal") { + return true; + } +#endif if (p_feature == "arm64") { return true; } |