From 7dfdc8689286fb5bd379784b95b02ebd1cb12dc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 31 Mar 2023 11:47:51 +0200 Subject: [PATCH] Update vcpkg to current version (#38) * Update vcpkg to current version Updates: - benchmark 1.6.1 -> 1.7.1 - breakpad 2020-09-14 -> 2022-07-12 - discord-rpc 3.4.0 (no change) - freetype 2.11.1 -> 2.12.1 - fribidi 1.0.12 (no change) - gtest 1.11.0 -> 1.13.0 - libflac 1.3.4 -> 1.4.2 - libogg 1.3.5 (no change) - libvorbis 1.3.7 (no change) - libpng 1.6.37 -> 1.6.39 - libzip 1.8.0 -> 1.9.2 - nlohmann-json 3.10.5 -> 3.11.2 - openal-soft 1.21.1 -> 1.23.0 - SDL 2.0.22 -> 2.26.4 - speexdsp 1.2.0 -> 1.2.1 - zlib 1.2.12 -> 1.2.13 * use icu[core,tools] for mac See https://github.com/microsoft/vcpkg/issues/30532 * Update vcpkg to c9f906558f9bb12ee9811d6edc98ec9255c6cda5 --- .github/workflows/ci.yml | 2 +- macos_build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0f7a57a5..2f177434 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,7 +1,7 @@ name: CI on: [push, pull_request] env: - VCPKG_COMMIT_HASH: 5e7cbdceacd2b3cb85e057963fdb605136805bd3 + VCPKG_COMMIT_HASH: c9f906558f9bb12ee9811d6edc98ec9255c6cda5 jobs: createrelease: name: createrelease diff --git a/macos_build.sh b/macos_build.sh index fdfa59f8..419fcda6 100755 --- a/macos_build.sh +++ b/macos_build.sh @@ -18,7 +18,7 @@ vcpkg/bootstrap-vcpkg.sh ARM_TRIPLET="--overlay-triplets=. --triplet=arm64-osx-openrct2" X64_TRIPLET="--overlay-triplets=. --triplet=x64-osx-openrct2" -LIBRARIES="libpng freetype openssl icu libzip[core] nlohmann-json openal-soft sdl2 speexdsp discord-rpc gtest libflac libogg libvorbis" +LIBRARIES="libpng freetype openssl icu[core,tools] libzip[core] nlohmann-json openal-soft sdl2 speexdsp discord-rpc gtest libflac libogg libvorbis" vcpkg/vcpkg install ${=ARM_TRIPLET} ${=LIBRARIES} vcpkg/vcpkg install ${=X64_TRIPLET} ${=LIBRARIES}