mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-03-03 04:20:30 +00:00
move all setup to toolchain
-All apple config in toolchain
This commit is contained in:
parent
e6c387c67a
commit
1b49f28d19
2 changed files with 1 additions and 23 deletions
|
|
@ -7,7 +7,7 @@ enable_language(OBJCXX)
|
|||
|
||||
set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE INTERNAL "")
|
||||
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE INTERNAL "")
|
||||
|
||||
set(CMAKE_SYSTEM_NAME Darwin)
|
||||
set(CMAKE_THREAD_LIBS_INIT "-lpthread")
|
||||
set(CMAKE_HAVE_THREADS_LIBRARY 1)
|
||||
set(CMAKE_USE_WIN32_THREADS_INIT 0)
|
||||
|
|
|
|||
|
|
@ -1,23 +1 @@
|
|||
#detect Architecture
|
||||
if (APPLE AND NOT IOS)
|
||||
option(TORQUE_MACOS_UNIVERSAL_BINARY OFF)
|
||||
|
||||
# Detect architecture if not using universal
|
||||
if (TORQUE_MACOS_UNIVERSAL_BINARY)
|
||||
set(ARCHITECTURE_STRING_APPLE "x86_64;arm64")
|
||||
set(DEPLOYMENT_TARGET_APPLE "10.13")
|
||||
else()
|
||||
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.13")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
set(CMAKE_OSX_ARCHITECTURES ${ARCHITECTURE_STRING_APPLE} CACHE STRING "OSX Architecture" FORCE)
|
||||
set(CMAKE_OSX_DEPLOYMENT_TARGET ${DEPLOYMENT_TARGET_APPLE} CACHE STRING "OSX Deployment target" FORCE)
|
||||
mark_as_advanced(CMAKE_OSX_ARCHITECTURES)
|
||||
mark_as_advanced(CMAKE_OSX_DEPLOYMENT_TARGET)
|
||||
endif()
|
||||
Loading…
Add table
Add a link
Reference in a new issue