From 8795a4f3309fe28be797bfbc2cb0bd451e4fb273 Mon Sep 17 00:00:00 2001 From: marauder2k7 Date: Sun, 11 May 2025 15:54:08 +0100 Subject: [PATCH] Revert "Update torqueConfig.h.in" This reverts commit f624a85ce4c4bb89d9281ddf4f65f5318eab4c01. --- Tools/CMake/torqueConfig.h.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Tools/CMake/torqueConfig.h.in b/Tools/CMake/torqueConfig.h.in index 717c05eb1..dde50431b 100644 --- a/Tools/CMake/torqueConfig.h.in +++ b/Tools/CMake/torqueConfig.h.in @@ -53,8 +53,13 @@ /// Define me if you want to enable multithreading support. #cmakedefine TORQUE_MULTITHREAD -/// Define me if you want to disable Torque memory manager. #cmakedefine TORQUE_DISABLE_MEMORY_MANAGER +/// Define me if you want to disable Torque memory manager. +#ifndef TORQUE_ENABLE_ASSERTS +#ifdef TORQUE_DISABLE_MEMORY_MANAGER +#undef TORQUE_DISABLE_MEMORY_MANAGER +#endif +#endif /// Define me if you want to disable the virtual mount system. #cmakedefine TORQUE_DISABLE_VIRTUAL_MOUNT_SYSTEM