From edaa8e4a802ed9943e04500a64046661b56e94ef Mon Sep 17 00:00:00 2001 From: Malcolm Tyrrell Date: Wed, 24 Jun 2020 11:37:43 +0100 Subject: [PATCH] Need to use ASSIMP_BUILD_DEBUG. --- include/assimp/ai_assert.h | 2 +- test/unit/Common/utAssertHandler.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/assimp/ai_assert.h b/include/assimp/ai_assert.h index 6045a9801..320104cfb 100644 --- a/include/assimp/ai_assert.h +++ b/include/assimp/ai_assert.h @@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_ASSERT_H_INC #define AI_ASSERT_H_INC -#if defined(ASSIMP_BUILD_DEBUG) || defined(ASSIMP_BUILD_WITH_ASSERTS) +#if defined(ASSIMP_BUILD_DEBUG) namespace Assimp { diff --git a/test/unit/Common/utAssertHandler.cpp b/test/unit/Common/utAssertHandler.cpp index d04162bdc..4a567c0c3 100644 --- a/test/unit/Common/utAssertHandler.cpp +++ b/test/unit/Common/utAssertHandler.cpp @@ -42,8 +42,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "UnitTestPCH.h" /// Ensure this test has asserts on, even if the build type doesn't have asserts by default. -#if !defined(ASSIMP_BUILD_WITH_ASSERTS) -#define ASSIMP_BUILD_WITH_ASSERTS +#if !defined(ASSIMP_BUILD_DEBUG) +#define ASSIMP_BUILD_DEBUG #endif #include