use real clang for windows builds

This commit is contained in:
ConfiG 2024-06-28 00:50:47 +03:00 committed by GitHub
parent bb45ed5ad7
commit 21c928856c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions

View file

@ -103,7 +103,7 @@ jobs:
run: ${{ env.base-configure-command }} -DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN ${{ steps.build-debug-info.outputs.extra-configure }} run: ${{ env.base-configure-command }} -DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN ${{ steps.build-debug-info.outputs.extra-configure }}
env: env:
SPLAT_DIR: ${{ github.workspace }}/.xwin-cache/splat 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 HOST_ARCH: x86_64
- name: Build - name: Build

View file

@ -248,7 +248,7 @@ if (NOT GEODE_BUILDING_DOCS)
set(MZ_LIBBSD OFF CACHE INTERNAL "") set(MZ_LIBBSD OFF CACHE INTERNAL "")
set(MZ_FETCH_LIBS ON CACHE INTERNAL "") set(MZ_FETCH_LIBS ON CACHE INTERNAL "")
set(SKIP_INSTALL_ALL 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) if (WIN32)
set_target_properties(zlib PROPERTIES SUFFIX "1.dll") set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
endif() endif()