diff options
| author | Rémi Verschelde | 2017-05-08 22:22:20 +0200 |
|---|---|---|
| committer | Rémi Verschelde | 2017-05-08 22:22:20 +0200 |
| commit | 32afcbc48258ea970ef4b0707f69543baf0f2f5a (patch) | |
| tree | 1de39c43391806058ee1f9da416f426475c2e5e3 /modules | |
| parent | bba8f1db307459988385faa4e79fd4aace397e36 (diff) | |
| download | godot-32afcbc48258ea970ef4b0707f69543baf0f2f5a.tar.gz godot-32afcbc48258ea970ef4b0707f69543baf0f2f5a.tar.zst godot-32afcbc48258ea970ef4b0707f69543baf0f2f5a.zip | |
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gdnative/gdnative.cpp | 1 | ||||
| -rw-r--r-- | modules/webm/libvpx/SCsub | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/modules/gdnative/gdnative.cpp b/modules/gdnative/gdnative.cpp index 09859d95b..e74d601d7 100644 --- a/modules/gdnative/gdnative.cpp +++ b/modules/gdnative/gdnative.cpp @@ -515,7 +515,6 @@ static const char *_dl_platforms_info[] = { "unix|x11|so|X11", "unix|server|so|Server", "unix|android|so|Android", - "unix|blackberry|so|Blackberry 10", "unix|haiku|so|Haiku", // Right? "|mac|dynlib|Mac", "mac|ios|dynlib|iOS", diff --git a/modules/webm/libvpx/SCsub b/modules/webm/libvpx/SCsub index 241d6e30c..0ee2ed45b 100644 --- a/modules/webm/libvpx/SCsub +++ b/modules/webm/libvpx/SCsub @@ -273,7 +273,7 @@ else: webm_cpu_x86 = True else: webm_cpu_x86 = not is_x11_or_server_arm and (cpu_bits == '32' or cpu_bits == '64') and (env["platform"] == 'windows' or env["platform"] == 'x11' or env["platform"] == 'osx' or env["platform"] == 'haiku' or is_android_x86 or is_ios_x86) - webm_cpu_arm = is_x11_or_server_arm or (not is_ios_x86 and env["platform"] == 'iphone') or env["platform"] == 'bb10' or (not is_android_x86 and env["platform"] == 'android') + webm_cpu_arm = is_x11_or_server_arm or (not is_ios_x86 and env["platform"] == 'iphone') or (not is_android_x86 and env["platform"] == 'android') if webm_cpu_x86: import subprocess |