SCons: Cleanup DEBUG
, _DEBUG
and NDEBUG
defines
- `_DEBUG` is MSVC specific so it didn't make much sense to define for
Android and iOS builds.
- iOS was the only platform to define `DEBUG`. We don't use it anywhere
outside thirdparty code, which we usually don't intend to debug, so it
seems better to be consistent with other platforms.
- Consistently define `NDEBUG` to disable assert behavior in both `release`
and `release_debug` targets. This used to be set for `release` for all
platforms, and `release_debug` for Android and iOS only.
- Due to the above, I removed the only use we made of `assert()` in Godot
code, which was only implemented for Unix anyway, should have been
`DEV_ENABLED`, and is in PoolAllocator which we don't actually use.
- The denoise and recast modules keep defining `NDEBUG` even for the `debug`
target as we don't want OIDN and Embree asserting all over the place.
(cherry picked from commit 26e9145c26
)
This commit is contained in:
parent
bd248650d1
commit
b0b759e6da
12 changed files with 9 additions and 32 deletions
|
@ -330,6 +330,9 @@ if env_base["target"] == "debug":
|
|||
# DEV_ENABLED enables *engine developer* code which should only be compiled for those
|
||||
# working on the engine itself.
|
||||
env_base.Append(CPPDEFINES=["DEV_ENABLED"])
|
||||
else:
|
||||
# Disable assert() for production targets (only used in thirdparty code).
|
||||
env_base.Append(CPPDEFINES=["NDEBUG"])
|
||||
|
||||
# SCons speed optimization controlled by the `fast_unsafe` option, which provide
|
||||
# more than 10 s speed up for incremental rebuilds.
|
||||
|
@ -542,7 +545,6 @@ if selected_platform in platform_list:
|
|||
print(" Use `tools=no target=release` to build a release export template.")
|
||||
Exit(255)
|
||||
suffix += ".opt"
|
||||
env.Append(CPPDEFINES=["NDEBUG"])
|
||||
elif env["target"] == "release_debug":
|
||||
if env["tools"]:
|
||||
suffix += ".opt.tools"
|
||||
|
|
|
@ -90,10 +90,6 @@ uint64_t OS::get_system_time_msecs() const {
|
|||
double OS::get_subsecond_unix_time() const {
|
||||
return 0.0;
|
||||
}
|
||||
void OS::debug_break(){
|
||||
|
||||
// something
|
||||
};
|
||||
|
||||
void OS::_set_logger(CompositeLogger *p_logger) {
|
||||
if (_logger) {
|
||||
|
|
|
@ -569,8 +569,6 @@ public:
|
|||
virtual void enable_for_stealing_focus(ProcessID pid) {}
|
||||
virtual void move_window_to_foreground() {}
|
||||
|
||||
virtual void debug_break();
|
||||
|
||||
virtual void release_rendering_thread();
|
||||
virtual void make_rendering_thread();
|
||||
virtual void swap_buffers();
|
||||
|
|
|
@ -35,8 +35,6 @@
|
|||
#include "core/os/os.h"
|
||||
#include "core/print_string.h"
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
#define COMPACT_CHUNK(m_entry, m_to_pos) \
|
||||
do { \
|
||||
void *_dst = &((unsigned char *)pool)[m_to_pos]; \
|
||||
|
@ -169,11 +167,6 @@ bool PoolAllocator::find_entry_index(EntryIndicesPos *p_map_pos, Entry *p_entry)
|
|||
|
||||
PoolAllocator::ID PoolAllocator::alloc(int p_size) {
|
||||
ERR_FAIL_COND_V(p_size < 1, POOL_ALLOCATOR_INVALID_ID);
|
||||
#ifdef DEBUG_ENABLED
|
||||
if (p_size > free_mem) {
|
||||
OS::get_singleton()->debug_break();
|
||||
}
|
||||
#endif
|
||||
ERR_FAIL_COND_V(p_size > free_mem, POOL_ALLOCATOR_INVALID_ID);
|
||||
|
||||
mt_lock();
|
||||
|
@ -482,7 +475,6 @@ void *PoolAllocator::get(ID p_mem) {
|
|||
ERR_FAIL_COND_V(!e, nullptr);
|
||||
}
|
||||
if (e->lock == 0) {
|
||||
//assert(0);
|
||||
mt_unlock();
|
||||
ERR_PRINT("e->lock == 0");
|
||||
return nullptr;
|
||||
|
|
|
@ -49,7 +49,6 @@
|
|||
#include <sys/sysctl.h>
|
||||
#endif
|
||||
|
||||
#include <assert.h>
|
||||
#include <dlfcn.h>
|
||||
#include <errno.h>
|
||||
#include <poll.h>
|
||||
|
@ -87,10 +86,6 @@ static void _setup_clock() {
|
|||
}
|
||||
#endif
|
||||
|
||||
void OS_Unix::debug_break() {
|
||||
assert(false);
|
||||
};
|
||||
|
||||
static void handle_interrupt(int sig) {
|
||||
if (ScriptDebugger::get_singleton() == nullptr) {
|
||||
return;
|
||||
|
|
|
@ -95,7 +95,6 @@ public:
|
|||
virtual bool set_environment(const String &p_var, const String &p_value) const;
|
||||
virtual String get_locale() const;
|
||||
|
||||
virtual void debug_break();
|
||||
virtual void initialize_debugging();
|
||||
|
||||
virtual String get_executable_path() const;
|
||||
|
|
|
@ -241,7 +241,6 @@
|
|||
GCC_DYNAMIC_NO_PIC = NO;
|
||||
GCC_OPTIMIZATION_LEVEL = 0;
|
||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||
"DEBUG=1",
|
||||
"$(inherited)",
|
||||
);
|
||||
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
|
||||
|
|
|
@ -103,9 +103,9 @@ env_oidn.Append(
|
|||
"__STDC_LIMIT_MACROS",
|
||||
"DISABLE_VERBOSE",
|
||||
"MKLDNN_ENABLE_CONCURRENT_EXEC",
|
||||
"NDEBUG",
|
||||
]
|
||||
)
|
||||
env_oidn.AppendUnique(CPPDEFINES=["NDEBUG"]) # No assert() even in debug builds.
|
||||
|
||||
env_thirdparty = env_oidn.Clone()
|
||||
env_thirdparty.disable_warnings()
|
||||
|
|
|
@ -60,7 +60,8 @@ if env["builtin_embree"]:
|
|||
thirdparty_sources = [thirdparty_dir + file for file in embree_src]
|
||||
|
||||
env_raycast.Prepend(CPPPATH=[thirdparty_dir, thirdparty_dir + "include"])
|
||||
env_raycast.Append(CPPDEFINES=["EMBREE_TARGET_SSE2", "EMBREE_LOWEST_ISA", "TASKING_INTERNAL", "NDEBUG"])
|
||||
env_raycast.Append(CPPDEFINES=["EMBREE_TARGET_SSE2", "EMBREE_LOWEST_ISA", "TASKING_INTERNAL"])
|
||||
env_raycast.AppendUnique(CPPDEFINES=["NDEBUG"]) # No assert() even in debug builds.
|
||||
|
||||
if not env.msvc:
|
||||
if env["arch"] in ["x86", "x86_64"]:
|
||||
|
|
|
@ -129,12 +129,9 @@ def configure(env):
|
|||
env.Append(CCFLAGS=[opt])
|
||||
elif env["optimize"] == "size": # optimize for size
|
||||
env.Append(CCFLAGS=["-Oz"])
|
||||
env.Append(CPPDEFINES=["NDEBUG"])
|
||||
elif env["target"] == "debug":
|
||||
env.Append(LINKFLAGS=["-O0"])
|
||||
env.Append(CCFLAGS=["-O0", "-g", "-fno-limit-debug-info"])
|
||||
env.Append(CPPDEFINES=["_DEBUG"])
|
||||
env.Append(CPPFLAGS=["-UNDEBUG"])
|
||||
env.Append(CCFLAGS=["-O0", "-g"])
|
||||
|
||||
# LTO
|
||||
|
||||
|
|
|
@ -49,7 +49,7 @@ def configure(env):
|
|||
## Build type
|
||||
|
||||
if env["target"].startswith("release"):
|
||||
env.Append(CPPDEFINES=["NDEBUG", ("NS_BLOCK_ASSERTIONS", 1)])
|
||||
env.Append(CPPDEFINES=[("NS_BLOCK_ASSERTIONS", 1)])
|
||||
if env["optimize"] == "speed": # optimize for speed (default)
|
||||
# `-O2` is more friendly to debuggers than `-O3`, leading to better crash backtraces
|
||||
# when using `target=release_debug`.
|
||||
|
@ -61,8 +61,7 @@ def configure(env):
|
|||
env.Append(LINKFLAGS=["-Os"])
|
||||
|
||||
elif env["target"] == "debug":
|
||||
env.Append(CCFLAGS=["-gdwarf-2", "-O0"])
|
||||
env.Append(CPPDEFINES=["_DEBUG", ("DEBUG", 1)])
|
||||
env.Append(CCFLAGS=["-g", "-O0"])
|
||||
|
||||
## LTO
|
||||
|
||||
|
|
|
@ -193,7 +193,6 @@ def configure_msvc(env, manual_msvc_config):
|
|||
|
||||
elif env["target"] == "debug":
|
||||
env.AppendUnique(CCFLAGS=["/Zi", "/FS", "/Od", "/EHsc"])
|
||||
# Allow big objects. Only needed for debug, see MinGW branch for rationale.
|
||||
env.Append(LINKFLAGS=["/DEBUG"])
|
||||
|
||||
if env["windows_subsystem"] == "gui":
|
||||
|
|
Loading…
Reference in a new issue