Kaynağa Gözat

Merge pull request #105697 from akien-mga/scons-x86_32-mfpmath-sse

SCons: Explicitly enable `-mfpmath=sse -mstackrealign` for x86_32
Thaddeus Crews 3 ay önce
ebeveyn
işleme
2242bf9b3d
3 değiştirilmiş dosya ile 1 ekleme ve 4 silme
  1. 1 1
      SConstruct
  2. 0 1
      modules/raycast/SCsub
  3. 0 2
      platform/android/detect.py

+ 1 - 1
SConstruct

@@ -718,7 +718,7 @@ if env["arch"] == "x86_32":
     if env.msvc:
         env.Append(CCFLAGS=["/arch:SSE2"])
     else:
-        env.Append(CCFLAGS=["-msse2"])
+        env.Append(CCFLAGS=["-msse2", "-mfpmath=sse", "-mstackrealign"])
 
 # Explicitly specify colored output.
 if methods.using_gcc(env):

+ 0 - 1
modules/raycast/SCsub

@@ -71,7 +71,6 @@ if env["builtin_embree"]:
             env.Append(LINKFLAGS=["psapi.lib"])
         else:
             env.Append(LIBS=["psapi"])
-            env_raycast.Append(CCFLAGS=["-mstackrealign"])
 
     if env.msvc:  # Disable bogus warning about intentional struct padding.
         env_raycast.Append(CCFLAGS=["/wd4324"])

+ 0 - 2
platform/android/detect.py

@@ -207,8 +207,6 @@ def configure(env: "SConsEnvironment"):
         env.Append(CPPDEFINES=[("_FILE_OFFSET_BITS", 64)])
 
     if env["arch"] == "x86_32":
-        # The NDK adds this if targeting API < 24, so we can drop it when Godot targets it at least
-        env.Append(CCFLAGS=["-mstackrealign"])
         if has_swappy:
             env.Append(LIBPATH=["#thirdparty/swappy-frame-pacing/x86"])
     elif env["arch"] == "x86_64":