diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2017-11-21 23:59:01 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-21 23:59:01 +0100 |
commit | bedcbdd420c20ff37f5afc1b81080fd7b25c2a2f (patch) | |
tree | 94d78a0af43166db6b13121cee8999f80bdd2df1 /core/os/os.cpp | |
parent | 817efd0b68f0072c6fbc51ee60dd49fd3bab929e (diff) | |
parent | ebf9b80a47f530e3f75e1e69c7ab48cfaf6cf595 (diff) |
Merge pull request #13130 from endragor/gdnative-android-export
Proper GDNative export on Android
Diffstat (limited to 'core/os/os.cpp')
-rw-r--r-- | core/os/os.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/os/os.cpp b/core/os/os.cpp index 0e7e26df73..84937c0e59 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -554,7 +554,7 @@ bool OS::has_feature(const String &p_feature) { if (sizeof(void *) == 4 && p_feature == "32") { return true; } -#if defined(__x86_64) || defined(__x86_64__) +#if defined(__x86_64) || defined(__x86_64__) || defined(__amd64__) if (p_feature == "x86_64") { return true; } |