diff --git a/SConstruct b/SConstruct index 7782b2acc..309a642a3 100644 --- a/SConstruct +++ b/SConstruct @@ -334,6 +334,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. @@ -574,7 +577,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" diff --git a/core/os/os.cpp b/core/os/os.cpp index 317e2120a..a84a76bbd 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -205,11 +205,6 @@ int64_t OS::get_unix_time_from_datetime(const DateTime &datetime) const { return epoch; } -void OS::debug_break(){ - - // something -}; - void OS::_set_logger(CompositeLogger *p_logger) { if (_logger) { memdelete(_logger); diff --git a/core/os/os.h b/core/os/os.h index f3d7ef309..71a688ff4 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -546,8 +546,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(); diff --git a/core/os/pool_allocator.cpp b/core/os/pool_allocator.cpp index 6c961d018..9e0668712 100644 --- a/core/os/pool_allocator.cpp +++ b/core/os/pool_allocator.cpp @@ -35,8 +35,6 @@ #include "core/os/os.h" #include "core/string/print_string.h" -#include - #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; diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index 64f21952b..ec68f7d79 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -49,7 +49,6 @@ #include #endif -#include #include #include #include @@ -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; diff --git a/drivers/unix/os_unix.h b/drivers/unix/os_unix.h index 42d7c8020..59be382d4 100644 --- a/drivers/unix/os_unix.h +++ b/drivers/unix/os_unix.h @@ -95,7 +95,6 @@ public: virtual int get_processor_count() const; - virtual void debug_break(); virtual void initialize_debugging(); virtual String get_executable_path() const; diff --git a/misc/dist/ios_xcode/pandemonium_ios.xcodeproj/project.pbxproj b/misc/dist/ios_xcode/pandemonium_ios.xcodeproj/project.pbxproj index 29f522ab0..57643451c 100644 --- a/misc/dist/ios_xcode/pandemonium_ios.xcodeproj/project.pbxproj +++ b/misc/dist/ios_xcode/pandemonium_ios.xcodeproj/project.pbxproj @@ -236,7 +236,6 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", "$(inherited)", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; diff --git a/platform/android/detect.py b/platform/android/detect.py index 23b0b8b69..973da36a4 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -120,13 +120,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 diff --git a/platform/iphone/detect.py b/platform/iphone/detect.py index 2b81fe5cb..bfbcc46d2 100644 --- a/platform/iphone/detect.py +++ b/platform/iphone/detect.py @@ -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 diff --git a/platform/windows/detect.py b/platform/windows/detect.py index 97980c65a..acf68f639 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -193,7 +193,6 @@ def configure_msvc(env, manual_msvc_config): elif env["target"] == "debug": env.AppendUnique(CCFLAGS=["/Zi", "/FS", "/Od"]) - # Allow big objects. Only needed for debug, see MinGW branch for rationale. env.Append(LINKFLAGS=["/DEBUG"]) if env["windows_subsystem"] == "gui":