From 21c928856cadca2c6e1fa28ae18c798d1c3450bd Mon Sep 17 00:00:00 2001 From: ConfiG Date: Fri, 28 Jun 2024 00:50:47 +0300 Subject: [PATCH] use real clang for windows builds --- .github/workflows/build.yml | 2 +- loader/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1bbb2e49..b3d2b5da 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -103,7 +103,7 @@ jobs: run: ${{ env.base-configure-command }} -DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN ${{ steps.build-debug-info.outputs.extra-configure }} env: SPLAT_DIR: ${{ github.workspace }}/.xwin-cache/splat - TOOLCHAIN: ${{ github.workspace }}/toolchain/clang-cl-msvc.cmake + TOOLCHAIN: ${{ github.workspace }}/toolchain/clang-msvc.cmake HOST_ARCH: x86_64 - name: Build diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt index 6fb7121d..34f7f292 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt @@ -248,7 +248,7 @@ if (NOT GEODE_BUILDING_DOCS) set(MZ_LIBBSD OFF CACHE INTERNAL "") set(MZ_FETCH_LIBS ON CACHE INTERNAL "") set(SKIP_INSTALL_ALL ON CACHE INTERNAL "") - CPMAddPackage("gh:geode-sdk/minizip-ng#011a133") + CPMAddPackage("gh:geode-sdk/minizip-ng#7548419") if (WIN32) set_target_properties(zlib PROPERTIES SUFFIX "1.dll") endif()