diff options
| -rw-r--r-- | modules/gdscript/gd_parser.cpp | 2 | ||||
| -rw-r--r-- | platform/android/detect.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/modules/gdscript/gd_parser.cpp b/modules/gdscript/gd_parser.cpp index 1540bb51f8..4c2965c8ec 100644 --- a/modules/gdscript/gd_parser.cpp +++ b/modules/gdscript/gd_parser.cpp @@ -2420,7 +2420,7 @@ void GDParser::_parse_block(BlockNode *p_block, bool p_static) { p_block->sub_blocks.push_back(cf_if->body); if (!_enter_indent_block(cf_if->body)) { - _set_error("Expected intended block after 'if'"); + _set_error("Expected indented block after 'if'"); p_block->end_line = tokenizer->get_token_line(); return; } diff --git a/platform/android/detect.py b/platform/android/detect.py index 0e78a4618d..8d2ed59f17 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -175,6 +175,8 @@ def configure(env): if env['android_arch'] == 'x86': can_vectorize = True target_opts = ['-target', 'i686-none-linux-android'] + # The NDK adds this if targeting API < 21, so we can drop it when Godot targets it at least + env.Append(CPPFLAGS=['-mstackrealign']) elif env["android_arch"] == "armv6": can_vectorize = False target_opts = ['-target', 'armv6-none-linux-androideabi'] |