浏览代码

Merge pull request #8274 from RandomShaper/fix-android-x86

Fix crash on Android-x86
Rémi Verschelde 8 年之前
父节点
当前提交
64ebc3672e
共有 1 个文件被更改,包括 2 次插入0 次删除
  1. 2 0
      platform/android/detect.py

+ 2 - 0
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']