From cf04264dba621c3f1159770c940ca014837c568a Mon Sep 17 00:00:00 2001 From: Trihedraf Date: Tue, 9 Sep 2025 06:39:01 -0700 Subject: [PATCH] enable iOS ZeroTier --- .github/workflows/iOS.yml | 4 ++-- 3rdParty/libzt/CMakeLists.txt | 2 +- CMake/platforms/ios.cmake | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/iOS.yml b/.github/workflows/iOS.yml index d030a8239..ed57654b7 100644 --- a/.github/workflows/iOS.yml +++ b/.github/workflows/iOS.yml @@ -39,8 +39,8 @@ jobs: uses: actions/cache@v4 with: path: build - key: ${{ github.workflow }}-v4-${{ github.sha }} - restore-keys: ${{ github.workflow }}-v4- + key: ${{ github.workflow }}-v5-${{ github.sha }} + restore-keys: ${{ github.workflow }}-v5- - name: Configure CMake # Use a bash shell so we can use the same syntax for environment variable diff --git a/3rdParty/libzt/CMakeLists.txt b/3rdParty/libzt/CMakeLists.txt index 22d4d9338..ed19d6cd5 100644 --- a/3rdParty/libzt/CMakeLists.txt +++ b/3rdParty/libzt/CMakeLists.txt @@ -5,7 +5,7 @@ set(BUILD_HOST_SELFTEST OFF) include(FetchContent) FetchContent_Declare_ExcludeFromAll(libzt GIT_REPOSITORY https://github.com/diasurgical/libzt.git - GIT_TAG 72a518bcf7d87e32f718ca612ce2c8303ceedd12) + GIT_TAG 1a9d83b8c4c2bdcd7ea6d8ab1dd2771b16eb4e13) FetchContent_MakeAvailable_ExcludeFromAll(libzt) if(NOT ANDROID) diff --git a/CMake/platforms/ios.cmake b/CMake/platforms/ios.cmake index 6287a778b..08e967d79 100644 --- a/CMake/platforms/ios.cmake +++ b/CMake/platforms/ios.cmake @@ -12,7 +12,6 @@ set(DEVILUTIONX_SYSTEM_LIBSODIUM OFF) set(DEVILUTIONX_SYSTEM_LIBPNG OFF) set(DEVILUTIONX_SYSTEM_LIBFMT OFF) -set(DISABLE_ZERO_TIER ON) set(NOEXIT ON) # Disable sanitizers. They're not supported out-of-the-box.