diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-07-23 09:39:07 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-07-23 09:39:10 +0200 |
| commit | dcf902df85545cfae62cf7936f294351b862d139 (patch) | |
| tree | 033e96be298c262e41d3bafd1773669841bf7296 | |
| parent | e38ad5d3de5cc8a24f45247e168edcdf309450b7 (diff) | |
| download | redot-engine-dcf902df85545cfae62cf7936f294351b862d139.tar.gz | |
SCons: Remove unused DEBUG_MEMORY_ENABLED define
Its last use was removed in Godot 3.0, so it no longer makes sense to define.
Also removed `D3D_DEBUG_INFO` for Windows as it's likely a left over from a
long time ago pre-opensourcing when Godot had some form of Direct3D 9 support?
| -rw-r--r-- | platform/android/detect.py | 2 | ||||
| -rw-r--r-- | platform/iphone/detect.py | 2 | ||||
| -rw-r--r-- | platform/linuxbsd/detect.py | 2 | ||||
| -rw-r--r-- | platform/osx/detect.py | 2 | ||||
| -rw-r--r-- | platform/server/detect.py | 2 | ||||
| -rw-r--r-- | platform/uwp/detect.py | 2 | ||||
| -rw-r--r-- | platform/windows/detect.py | 4 |
7 files changed, 8 insertions, 8 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py index 6da1e5f3d6..a4ac87f723 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -164,7 +164,7 @@ def configure(env): elif env["target"] == "debug": env.Append(LINKFLAGS=["-O0"]) env.Append(CCFLAGS=["-O0", "-g", "-fno-limit-debug-info"]) - env.Append(CPPDEFINES=["_DEBUG", "DEBUG_ENABLED", "DEBUG_MEMORY_ENABLED"]) + env.Append(CPPDEFINES=["_DEBUG", "DEBUG_ENABLED"]) env.Append(CPPFLAGS=["-UNDEBUG"]) # Compiler configuration diff --git a/platform/iphone/detect.py b/platform/iphone/detect.py index 3e6c2f0ecf..c48eb7ff0e 100644 --- a/platform/iphone/detect.py +++ b/platform/iphone/detect.py @@ -67,7 +67,7 @@ def configure(env): elif env["target"] == "debug": env.Append(CCFLAGS=["-gdwarf-2", "-O0"]) - env.Append(CPPDEFINES=["_DEBUG", ("DEBUG", 1), "DEBUG_ENABLED", "DEBUG_MEMORY_ENABLED"]) + env.Append(CPPDEFINES=["_DEBUG", ("DEBUG", 1), "DEBUG_ENABLED"]) if env["use_lto"]: env.Append(CCFLAGS=["-flto"]) diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py index 07fa06bc06..3eb4c44bc1 100644 --- a/platform/linuxbsd/detect.py +++ b/platform/linuxbsd/detect.py @@ -109,7 +109,7 @@ def configure(env): elif env["target"] == "debug": env.Prepend(CCFLAGS=["-g3"]) - env.Prepend(CPPDEFINES=["DEBUG_ENABLED", "DEBUG_MEMORY_ENABLED"]) + env.Prepend(CPPDEFINES=["DEBUG_ENABLED"]) env.Append(LINKFLAGS=["-rdynamic"]) ## Architecture diff --git a/platform/osx/detect.py b/platform/osx/detect.py index ca28e1e70e..25d230fc89 100644 --- a/platform/osx/detect.py +++ b/platform/osx/detect.py @@ -72,7 +72,7 @@ def configure(env): elif env["target"] == "debug": env.Prepend(CCFLAGS=["-g3"]) - env.Prepend(CPPDEFINES=["DEBUG_ENABLED", "DEBUG_MEMORY_ENABLED"]) + env.Prepend(CPPDEFINES=["DEBUG_ENABLED"]) ## Architecture diff --git a/platform/server/detect.py b/platform/server/detect.py index a73810cdf4..4c5a4527ae 100644 --- a/platform/server/detect.py +++ b/platform/server/detect.py @@ -79,7 +79,7 @@ def configure(env): elif env["target"] == "debug": env.Prepend(CCFLAGS=["-g3"]) - env.Prepend(CPPDEFINES=["DEBUG_ENABLED", "DEBUG_MEMORY_ENABLED"]) + env.Prepend(CPPDEFINES=["DEBUG_ENABLED"]) env.Append(LINKFLAGS=["-rdynamic"]) ## Architecture diff --git a/platform/uwp/detect.py b/platform/uwp/detect.py index 669bfe6814..c23a65ef75 100644 --- a/platform/uwp/detect.py +++ b/platform/uwp/detect.py @@ -69,7 +69,7 @@ def configure(env): elif env["target"] == "debug": env.Append(CCFLAGS=["/Zi"]) env.Append(CCFLAGS=["/MDd"]) - env.Append(CPPDEFINES=["DEBUG_ENABLED", "DEBUG_MEMORY_ENABLED"]) + env.Append(CPPDEFINES=["DEBUG_ENABLED"]) env.Append(LINKFLAGS=["/SUBSYSTEM:CONSOLE"]) env.Append(LINKFLAGS=["/DEBUG"]) diff --git a/platform/windows/detect.py b/platform/windows/detect.py index 9f79e92dcb..0ab0e1ed3c 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -196,7 +196,7 @@ def configure_msvc(env, manual_msvc_config): elif env["target"] == "debug": env.AppendUnique(CCFLAGS=["/Z7", "/Od", "/EHsc"]) - env.AppendUnique(CPPDEFINES=["DEBUG_ENABLED", "DEBUG_MEMORY_ENABLED", "D3D_DEBUG_INFO"]) + env.AppendUnique(CPPDEFINES=["DEBUG_ENABLED"]) env.Append(LINKFLAGS=["/SUBSYSTEM:CONSOLE"]) env.Append(LINKFLAGS=["/DEBUG"]) @@ -333,7 +333,7 @@ def configure_mingw(env): elif env["target"] == "debug": env.Append(CCFLAGS=["-g3"]) - env.Append(CPPDEFINES=["DEBUG_ENABLED", "DEBUG_MEMORY_ENABLED"]) + env.Append(CPPDEFINES=["DEBUG_ENABLED"]) ## Compiler configuration |