From cf6fcb1089ebbb349f573fdb29cf592071ae972c Mon Sep 17 00:00:00 2001 From: past-due <30942300+past-due@users.noreply.github.com> Date: Wed, 24 Jan 2024 19:54:32 -0500 Subject: [PATCH 1/3] [Windows] Update vcpkg commit in get-dependencies_win.ps1 --- get-dependencies_win.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/get-dependencies_win.ps1 b/get-dependencies_win.ps1 index ae28afe1361..4afd1171951 100755 --- a/get-dependencies_win.ps1 +++ b/get-dependencies_win.ps1 @@ -5,7 +5,7 @@ param([string]$VCPKG_BUILD_TYPE = "") ############################ # To ensure reproducible builds, pin to a specific vcpkg commit -$VCPKG_COMMIT_SHA = "98a562a04cd03728f399e79e1b37bcccb5a69b37"; +$VCPKG_COMMIT_SHA = "11e79b1072c7f12d84258b77948cda3b166aac59"; # WZ Windows features (for vcpkg install) $VCPKG_INSTALL_FEATURES = @() From 84f1ccda5a92bc1fc77e24f59fdf69da8e60ce11 Mon Sep 17 00:00:00 2001 From: past-due <30942300+past-due@users.noreply.github.com> Date: Wed, 24 Jan 2024 19:54:55 -0500 Subject: [PATCH 2/3] [macOS] Update vcpkg commit in configure_mac.cmake --- configure_mac.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure_mac.cmake b/configure_mac.cmake index 11f09bd47c6..6480d4163fb 100644 --- a/configure_mac.cmake +++ b/configure_mac.cmake @@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.5) ######################################################## # To ensure reproducible builds, pin to a specific vcpkg commit -set(VCPKG_COMMIT_SHA "98a562a04cd03728f399e79e1b37bcccb5a69b37") +set(VCPKG_COMMIT_SHA "11e79b1072c7f12d84258b77948cda3b166aac59") # WZ minimum supported macOS deployment target (< 10.9 is untested) set(MIN_SUPPORTED_MACOSX_DEPLOYMENT_TARGET "10.9") From a5bb617ac35b226a442d0f6cb9caa93b988ae320 Mon Sep 17 00:00:00 2001 From: past-due <30942300+past-due@users.noreply.github.com> Date: Wed, 24 Jan 2024 19:55:12 -0500 Subject: [PATCH 3/3] vcpkg.json: Update builtin-baseline --- vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg.json b/vcpkg.json index fd509d6ab2b..92b9f4ac0b5 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "name": "warzone2100", "version-string": "master-branch", - "builtin-baseline": "98a562a04cd03728f399e79e1b37bcccb5a69b37", + "builtin-baseline": "11e79b1072c7f12d84258b77948cda3b166aac59", "dependencies": [ "sdl2", "physfs",