Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove references to SIMULATOR64, as 32 bit is no longer available

Browse Source
This commit is contained in:
Jonny Paton 2018-02-25 12:56:17 -08:00 committed by eXpl0it3r
parent b196aac5c7
commit 910458cfb3
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmake/toolchains/iOS.toolchain.cmake
View File

@ -17,10 +17,10 @@
# Options: # Options:
# #
# IOS_PLATFORM = OS (default) or SIMULATOR or SIMULATOR64 # IOS_PLATFORM = OS (default) or SIMULATOR
# This decides if SDKS will be selected from the iPhoneOS.platform or iPhoneSimulator.platform folders # This decides if SDKS will be selected from the iPhoneOS.platform or iPhoneSimulator.platform folders
# OS - the default, used to build for iPhone and iPad physical devices, which have an arm arch. # OS - the default, used to build for iPhone and iPad physical devices, which have an arm arch.
# SIMULATOR - used to build for the Simulator platforms, which have an x86 arch. # SIMULATOR - used to build for the Simulator platforms, which have an x86_64 arch.
# #
# CMAKE_IOS_DEVELOPER_ROOT = automatic(default) or /path/to/platform/Developer folder # CMAKE_IOS_DEVELOPER_ROOT = automatic(default) or /path/to/platform/Developer folder
# By default this location is automatcially chosen based on the IOS_PLATFORM value above. # By default this location is automatcially chosen based on the IOS_PLATFORM value above.
@ -127,15 +127,9 @@ elseif (${IOS_PLATFORM} STREQUAL SIMULATOR)
# This causes the installers to properly locate the output libraries # This causes the installers to properly locate the output libraries
set (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphonesimulator") set (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphonesimulator")
elseif (${IOS_PLATFORM} STREQUAL SIMULATOR64)
message (STATUS "Targeting iPhoneSimulator64 platform")
set (SIMULATOR true)
set (IOS_PLATFORM_LOCATION "iPhoneSimulator.platform")
# This causes the installers to properly locate the output libraries
set (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphonesimulator")
else (${IOS_PLATFORM} STREQUAL OS) else (${IOS_PLATFORM} STREQUAL OS)
message (FATAL_ERROR "Unsupported IOS_PLATFORM value '${IOS_PLATFORM}' selected. Please choose OS, SIMULATOR, or SIMULATOR64") message (FATAL_ERROR "Unsupported IOS_PLATFORM value '${IOS_PLATFORM}' selected. Please choose OS or SIMULATOR")
endif (${IOS_PLATFORM} STREQUAL OS) endif (${IOS_PLATFORM} STREQUAL OS)
# Setup iOS developer location unless specified manually with CMAKE_IOS_DEVELOPER_ROOT # Setup iOS developer location unless specified manually with CMAKE_IOS_DEVELOPER_ROOT
@ -174,7 +168,7 @@ message (STATUS "iOS sysroot=${CMAKE_OSX_SYSROOT}")
if (${IOS_PLATFORM} STREQUAL OS) if (${IOS_PLATFORM} STREQUAL OS)
set (OSX_UNIVERSAL true) set (OSX_UNIVERSAL true)
set (IOS_ARCH arm64) set (IOS_ARCH arm64)
elseif (${IOS_PLATFORM} STREQUAL SIMULATOR64) elseif (${IOS_PLATFORM} STREQUAL SIMULATOR)
set (IOS_ARCH x86_64) set (IOS_ARCH x86_64)
endif (${IOS_PLATFORM} STREQUAL OS) endif (${IOS_PLATFORM} STREQUAL OS)