godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-22 15:06:45 +00:00
Code Releases Wiki Activity

SCons: Fix debug_symbols tests after switch to BoolVariable

Browse Source 
Bug introduced in #45679.

Fixes part of #45816.

(cherry picked from commit 849c090343)

Also removes useless `debug_symbols=full` mode.
This commit is contained in:
Rémi Verschelde
2021-02-08 08:52:21 +01:00
parent 4211cb3dc7
commit 42d3d9c345
7 changed files with 38 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/osx/SCsub
View File

@@ -17,5 +17,5 @@ files = [
prog = env.add_program("#bin/godot", files) prog = env.add_program("#bin/godot", files)
if env["debug_symbols"] == "yes" and env["separate_debug_symbols"]: if env["debug_symbols"] and env["separate_debug_symbols"]:
env.AddPostAction(prog, run_in_subprocess(platform_osx_builders.make_debug_osx)) env.AddPostAction(prog, run_in_subprocess(platform_osx_builders.make_debug_osx))

6
platform/osx/detect.py
View File

@@ -41,7 +41,6 @@ def configure(env):
## Build type ## Build type
if env["target"] == "release": if env["target"] == "release":
if env["debug_symbols"] != "full":
if env["optimize"] == "speed": # optimize for speed (default) if env["optimize"] == "speed": # optimize for speed (default)
env.Prepend(CCFLAGS=["-O3", "-fomit-frame-pointer", "-ftree-vectorize"]) env.Prepend(CCFLAGS=["-O3", "-fomit-frame-pointer", "-ftree-vectorize"])
else: # optimize for size else: # optimize for size
@@ -49,11 +48,10 @@ def configure(env):
if env["arch"] != "arm64": if env["arch"] != "arm64":
env.Prepend(CCFLAGS=["-msse2"]) env.Prepend(CCFLAGS=["-msse2"])
if env["debug_symbols"] == "yes": if env["debug_symbols"]:
env.Prepend(CCFLAGS=["-g2"]) env.Prepend(CCFLAGS=["-g2"])
elif env["target"] == "release_debug": elif env["target"] == "release_debug":
if env["debug_symbols"] != "full":
if env["optimize"] == "speed": # optimize for speed (default) if env["optimize"] == "speed": # optimize for speed (default)
env.Prepend(CCFLAGS=["-O2"]) env.Prepend(CCFLAGS=["-O2"])
else: # optimize for size else: # optimize for size
@@ -61,7 +59,7 @@ def configure(env):
env.Prepend(CPPDEFINES=["DEBUG_ENABLED"]) env.Prepend(CPPDEFINES=["DEBUG_ENABLED"])
if env["debug_symbols"] == "yes": if env["debug_symbols"]:
env.Prepend(CCFLAGS=["-g2"]) env.Prepend(CCFLAGS=["-g2"])
elif env["target"] == "debug": elif env["target"] == "debug":

4
platform/server/detect.py
View File

@@ -57,7 +57,7 @@ def configure(env):
else: # optimize for size else: # optimize for size
env.Prepend(CCFLAGS=["-Os"]) env.Prepend(CCFLAGS=["-Os"])
if env["debug_symbols"] == "yes": if env["debug_symbols"]:
env.Prepend(CCFLAGS=["-g2"]) env.Prepend(CCFLAGS=["-g2"])
elif env["target"] == "release_debug": elif env["target"] == "release_debug":
@@ -67,7 +67,7 @@ def configure(env):
env.Prepend(CCFLAGS=["-Os"]) env.Prepend(CCFLAGS=["-Os"])
env.Prepend(CPPDEFINES=["DEBUG_ENABLED"]) env.Prepend(CPPDEFINES=["DEBUG_ENABLED"])
if env["debug_symbols"] == "yes": if env["debug_symbols"]:
env.Prepend(CCFLAGS=["-g2"]) env.Prepend(CCFLAGS=["-g2"])
elif env["target"] == "debug": elif env["target"] == "debug":

2
platform/windows/SCsub
View File

@@ -31,5 +31,5 @@ if env["vsproj"]:
env.vs_srcs += ["platform/windows/" + str(x)] env.vs_srcs += ["platform/windows/" + str(x)]
if not os.getenv("VCINSTALLDIR"): if not os.getenv("VCINSTALLDIR"):
if env["debug_symbols"] == "yes" and env["separate_debug_symbols"]: if env["debug_symbols"] and env["separate_debug_symbols"]:
env.AddPostAction(prog, run_in_subprocess(platform_windows_builders.make_debug_mingw)) env.AddPostAction(prog, run_in_subprocess(platform_windows_builders.make_debug_mingw))

9
platform/windows/detect.py
View File

@@ -176,7 +176,6 @@ def configure_msvc(env, manual_msvc_config):
# Build type # Build type
if env["target"] == "release": if env["target"] == "release":
if env["debug_symbols"] != "full":
if env["optimize"] == "speed": # optimize for speed (default) if env["optimize"] == "speed": # optimize for speed (default)
env.Append(CCFLAGS=["/O2"]) env.Append(CCFLAGS=["/O2"])
else: # optimize for size else: # optimize for size
@@ -186,7 +185,6 @@ def configure_msvc(env, manual_msvc_config):
env.Append(LINKFLAGS=["/OPT:REF"]) env.Append(LINKFLAGS=["/OPT:REF"])
elif env["target"] == "release_debug": elif env["target"] == "release_debug":
if env["debug_symbols"] != "full":
if env["optimize"] == "speed": # optimize for speed (default) if env["optimize"] == "speed": # optimize for speed (default)
env.Append(CCFLAGS=["/O2"]) env.Append(CCFLAGS=["/O2"])
else: # optimize for size else: # optimize for size
@@ -201,7 +199,7 @@ def configure_msvc(env, manual_msvc_config):
env.Append(LINKFLAGS=["/SUBSYSTEM:CONSOLE"]) env.Append(LINKFLAGS=["/SUBSYSTEM:CONSOLE"])
env.Append(LINKFLAGS=["/DEBUG"]) env.Append(LINKFLAGS=["/DEBUG"])
if env["debug_symbols"] == "yes": if env["debug_symbols"]:
env.AppendUnique(CCFLAGS=["/Z7"]) env.AppendUnique(CCFLAGS=["/Z7"])
env.AppendUnique(LINKFLAGS=["/DEBUG"]) env.AppendUnique(LINKFLAGS=["/DEBUG"])
@@ -308,16 +306,15 @@ def configure_mingw(env):
env.Append(CCFLAGS=["-O2"]) env.Append(CCFLAGS=["-O2"])
else: # optimize for size else: # optimize for size
env.Prepend(CCFLAGS=["-Os"]) env.Prepend(CCFLAGS=["-Os"])
env.Append(LINKFLAGS=["-Wl,--subsystem,windows"]) env.Append(LINKFLAGS=["-Wl,--subsystem,windows"])
if env["debug_symbols"] == "yes": if env["debug_symbols"]:
env.Prepend(CCFLAGS=["-g2"]) env.Prepend(CCFLAGS=["-g2"])
elif env["target"] == "release_debug": elif env["target"] == "release_debug":
env.Append(CCFLAGS=["-O2"]) env.Append(CCFLAGS=["-O2"])
env.Append(CPPDEFINES=["DEBUG_ENABLED"]) env.Append(CPPDEFINES=["DEBUG_ENABLED"])
if env["debug_symbols"] == "yes": if env["debug_symbols"]:
env.Prepend(CCFLAGS=["-g2"]) env.Prepend(CCFLAGS=["-g2"])
if env["optimize"] == "speed": # optimize for speed (default) if env["optimize"] == "speed": # optimize for speed (default)
env.Append(CCFLAGS=["-O2"]) env.Append(CCFLAGS=["-O2"])

2
platform/x11/SCsub
View File

@@ -17,5 +17,5 @@ common_x11 = [
prog = env.add_program("#bin/godot", ["godot_x11.cpp"] + common_x11) prog = env.add_program("#bin/godot", ["godot_x11.cpp"] + common_x11)
if env["debug_symbols"] == "yes" and env["separate_debug_symbols"]: if env["debug_symbols"] and env["separate_debug_symbols"]:
env.AddPostAction(prog, run_in_subprocess(platform_x11_builders.make_debug_x11)) env.AddPostAction(prog, run_in_subprocess(platform_x11_builders.make_debug_x11))

6
platform/x11/detect.py
View File

@@ -87,17 +87,15 @@ def configure(env):
## Build type ## Build type
if env["target"] == "release": if env["target"] == "release":
if env["debug_symbols"] != "full":
if env["optimize"] == "speed": # optimize for speed (default) if env["optimize"] == "speed": # optimize for speed (default)
env.Prepend(CCFLAGS=["-O3"]) env.Prepend(CCFLAGS=["-O3"])
else: # optimize for size else: # optimize for size
env.Prepend(CCFLAGS=["-Os"]) env.Prepend(CCFLAGS=["-Os"])
if env["debug_symbols"] == "yes": if env["debug_symbols"]:
env.Prepend(CCFLAGS=["-g2"]) env.Prepend(CCFLAGS=["-g2"])
elif env["target"] == "release_debug": elif env["target"] == "release_debug":
if env["debug_symbols"] != "full":
if env["optimize"] == "speed": # optimize for speed (default) if env["optimize"] == "speed": # optimize for speed (default)
env.Prepend(CCFLAGS=["-O2"]) env.Prepend(CCFLAGS=["-O2"])
else: # optimize for size else: # optimize for size
@@ -105,7 +103,7 @@ def configure(env):
env.Prepend(CPPDEFINES=["DEBUG_ENABLED"]) env.Prepend(CPPDEFINES=["DEBUG_ENABLED"])
if env["debug_symbols"] == "yes": if env["debug_symbols"]:
env.Prepend(CCFLAGS=["-g2"]) env.Prepend(CCFLAGS=["-g2"])
elif env["target"] == "debug": elif env["target"] == "debug":