TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 08:34:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into Preview4_0

Browse source
This commit is contained in:
Areloch 2021-11-08 12:51:13 -06:00
commit 9f51cc7e4c
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Engine/source/core/tokenizer.cpp
View file

@ -109,7 +109,10 @@ void Tokenizer::setBuffer(const char* buffer, U32 bufferSize)
void Tokenizer::setSingleTokens(const char* singleTokens) void Tokenizer::setSingleTokens(const char* singleTokens)
{ {
if (mSingleTokens) if (mSingleTokens)
SAFE_DELETE(mSingleTokens); {
free(mSingleTokens);
mSingleTokens = NULL;
}
if (singleTokens) if (singleTokens)
mSingleTokens = dStrdup(singleTokens); mSingleTokens = dStrdup(singleTokens);

5
Tools/CMake/torque3d.cmake
View file

@ -745,14 +745,13 @@ if (APPLE AND NOT IOS)
set(ARCHITECTURE_STRING_APPLE "x86_64;arm64") set(ARCHITECTURE_STRING_APPLE "x86_64;arm64")
set(DEPLOYMENT_TARGET_APPLE "10.13") set(DEPLOYMENT_TARGET_APPLE "10.13")
else() else()
check_c_compiler_flag("-arch arm64" armSupportedApple) if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
if(armSupportedApple)
set(ARCHITECTURE_STRING_APPLE "arm64") set(ARCHITECTURE_STRING_APPLE "arm64")
set(DEPLOYMENT_TARGET_APPLE "11.0") set(DEPLOYMENT_TARGET_APPLE "11.0")
else() else()
set(ARCHITECTURE_STRING_APPLE "x86_64") set(ARCHITECTURE_STRING_APPLE "x86_64")
set(DEPLOYMENT_TARGET_APPLE "10.9") set(DEPLOYMENT_TARGET_APPLE "10.9")
endif() endif()
endif() endif()
set(CMAKE_OSX_ARCHITECTURES ${ARCHITECTURE_STRING_APPLE} CACHE STRING "OSX Architecture" FORCE) set(CMAKE_OSX_ARCHITECTURES ${ARCHITECTURE_STRING_APPLE} CACHE STRING "OSX Architecture" FORCE)