From a6a7d6e1a1768bb4ef9f37652d218af36e06bf92 Mon Sep 17 00:00:00 2001 From: Robert MacGregor Date: Sat, 6 Nov 2021 20:34:12 -0400 Subject: [PATCH 1/2] * [Tokenizer] BugFix: Correct a malloc/delete mismatch in the tokenizer programming. --- Engine/source/core/tokenizer.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Engine/source/core/tokenizer.cpp b/Engine/source/core/tokenizer.cpp index 6d155d18a..e34c35819 100644 --- a/Engine/source/core/tokenizer.cpp +++ b/Engine/source/core/tokenizer.cpp @@ -109,7 +109,10 @@ void Tokenizer::setBuffer(const char* buffer, U32 bufferSize) void Tokenizer::setSingleTokens(const char* singleTokens) { if (mSingleTokens) - SAFE_DELETE(mSingleTokens); + { + free(mSingleTokens); + mSingleTokens = NULL; + } if (singleTokens) mSingleTokens = dStrdup(singleTokens); From 3fdd7266e340f87b6c1e97ec78de7c9f65fd2265 Mon Sep 17 00:00:00 2001 From: Jeff Hutchinson Date: Sat, 6 Nov 2021 22:56:05 -0400 Subject: [PATCH 2/2] Better Architecture detection strategy if compiling on Apple Silicon --- Tools/CMake/torque3d.cmake | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Tools/CMake/torque3d.cmake b/Tools/CMake/torque3d.cmake index 0629e944a..eadc2673a 100644 --- a/Tools/CMake/torque3d.cmake +++ b/Tools/CMake/torque3d.cmake @@ -745,14 +745,13 @@ if (APPLE AND NOT IOS) set(ARCHITECTURE_STRING_APPLE "x86_64;arm64") set(DEPLOYMENT_TARGET_APPLE "10.13") else() - check_c_compiler_flag("-arch arm64" armSupportedApple) - if(armSupportedApple) + if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm64") set(ARCHITECTURE_STRING_APPLE "arm64") set(DEPLOYMENT_TARGET_APPLE "11.0") else() set(ARCHITECTURE_STRING_APPLE "x86_64") set(DEPLOYMENT_TARGET_APPLE "10.9") - endif() + endif() endif() set(CMAKE_OSX_ARCHITECTURES ${ARCHITECTURE_STRING_APPLE} CACHE STRING "OSX Architecture" FORCE)