diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-11-22 00:40:18 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-11-22 00:40:18 +0000 |
| commit | 50114dd41d6d19421f49822f46d9978e501cdc8d (patch) | |
| tree | e5722363cc826df112a26f6b8f591276e59f694b /BuildTools/Scripts | |
| parent | Enabled ClearRenderTargetTest.AsAttachment on Metal (diff) | |
| download | DiligentCore-50114dd41d6d19421f49822f46d9978e501cdc8d.tar.gz DiligentCore-50114dd41d6d19421f49822f46d9978e501cdc8d.zip | |
iOS build: switched to using CMake-provided toolchain from custom toolchain
Diffstat (limited to 'BuildTools/Scripts')
| -rwxr-xr-x | BuildTools/Scripts/travis/build.sh | 2 | ||||
| -rwxr-xr-x | BuildTools/Scripts/travis/build_install.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/BuildTools/Scripts/travis/build.sh b/BuildTools/Scripts/travis/build.sh index 94038648..eb1ac790 100755 --- a/BuildTools/Scripts/travis/build.sh +++ b/BuildTools/Scripts/travis/build.sh @@ -10,7 +10,7 @@ fi if [ "$TRAVIS_OS_NAME" = "osx" ]; then if [ "$IOS" = "true" ]; then - cmake .. -DCMAKE_TOOLCHAIN_FILE=../DiligentCore/ios.toolchain.cmake -DIOS_PLATFORM=OS64 -DIOS_ARCH=arm64 -DVULKAN_SDK="$VULKAN_SDK" $1 -G "Xcode" || return + cmake .. -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 -DVULKAN_SDK="$VULKAN_SDK" $1 -G "Xcode" || return XCODE_BUILD_SETTINGS="CODE_SIGN_IDENTITY= CODE_SIGNING_REQUIRED=NO" else cmake .. $1 -G "Xcode" || return diff --git a/BuildTools/Scripts/travis/build_install.sh b/BuildTools/Scripts/travis/build_install.sh index 783f354b..baa5d676 100755 --- a/BuildTools/Scripts/travis/build_install.sh +++ b/BuildTools/Scripts/travis/build_install.sh @@ -10,7 +10,7 @@ fi if [ "$TRAVIS_OS_NAME" = "osx" ]; then if [ "$IOS" = "true" ]; then - cmake .. $1 -DCMAKE_TOOLCHAIN_FILE=../DiligentCore/ios.toolchain.cmake -DIOS_PLATFORM=OS64 -DIOS_ARCH=arm64 -DVULKAN_SDK="$VULKAN_SDK" -DCMAKE_INSTALL_PREFIX=install -G "Xcode" || return + cmake .. $1 -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 -DVULKAN_SDK="$VULKAN_SDK" -DCMAKE_INSTALL_PREFIX=install -G "Xcode" || return XCODE_BUILD_SETTINGS="CODE_SIGN_IDENTITY= CODE_SIGNING_REQUIRED=NO" else cmake .. $1 -DCMAKE_INSTALL_PREFIX=install -G "Xcode" || return |