From bf229a9c0bf0e3d8fe3ec113eeabe9f9b55da56c Mon Sep 17 00:00:00 2001 From: Areloch Date: Sat, 8 Apr 2017 21:06:47 -0500 Subject: [PATCH] Missed a bit. Readded an accidental removal, and cleaned up an extraneous endif --- Engine/source/console/debugOutputConsumer.h | 4 ++++ Engine/source/platform/platformCPUCount.cpp | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Engine/source/console/debugOutputConsumer.h b/Engine/source/console/debugOutputConsumer.h index d792a8f37..335f30170 100644 --- a/Engine/source/console/debugOutputConsumer.h +++ b/Engine/source/console/debugOutputConsumer.h @@ -27,6 +27,10 @@ //#define TORQUE_LOCBUILD +#if !defined(TORQUE_DEBUG) && !defined(TORQUE_LOCBUILD) + #define DISABLE_DEBUG_SPEW +#endif + #include "console/console.h" namespace DebugOutputConsumer diff --git a/Engine/source/platform/platformCPUCount.cpp b/Engine/source/platform/platformCPUCount.cpp index 8515ab627..fc066f75d 100644 --- a/Engine/source/platform/platformCPUCount.cpp +++ b/Engine/source/platform/platformCPUCount.cpp @@ -30,7 +30,7 @@ #include "platform/platform.h" #include "platform/platformCPUCount.h" -#if defined(TORQUE_OS_LINUX) || defined(TORQUE_OS_MAC) +#if defined(TORQUE_OS_LINUX) || defined(TORQUE_OS_OSX) #ifdef TORQUE_OS_LINUX // The Linux source code listing can be compiled using Linux kernel verison 2.6 @@ -654,6 +654,4 @@ next: } // namespace CPUInfo #endif -#endif - #endif \ No newline at end of file