diff options
| author | JoergAtGithub <64457745+JoergAtGithub@users.noreply.github.com> | 2023-06-14 19:53:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-14 19:53:28 +0200 |
| commit | 37a71a9410ba39d5cc7d4f95000de3cfe711ece3 (patch) | |
| tree | f25a5d00ed45dcd75e45f23a70f751216afa1c73 | |
| parent | f4b1e27b644f9a173dc93a707cfd824204802ab7 (diff) | |
| parent | 8f53f67852154f2636f242450b959692e015f63a (diff) | |
Merge pull request #11649 from daschuer/vcpkg_update
2.5-alpha: Update to latest vcpkg dependencies
| -rwxr-xr-x | tools/macos_buildenv.sh | 24 | ||||
| -rw-r--r-- | tools/windows_buildenv.bat | 12 |
2 files changed, 18 insertions, 18 deletions
diff --git a/tools/macos_buildenv.sh b/tools/macos_buildenv.sh index f69c33a982..d7900646da 100755 --- a/tools/macos_buildenv.sh +++ b/tools/macos_buildenv.sh @@ -21,23 +21,23 @@ THIS_SCRIPT_NAME=${BASH_SOURCE[0]} if [ -n "${BUILDENV_ARM64}" ]; then if [ -n "${BUILDENV_RELEASE}" ]; then - BUILDENV_BRANCH="2.4-rel" - BUILDENV_NAME="mixxx-deps-rel-2.4-arm64-osx-min1100-d5a93e2" - BUILDENV_SHA256="445a50bde14214b3fef718bf73a6dff721f0681bc582c04b872d5912bc1ae794" + BUILDENV_BRANCH="2.5-rel" + BUILDENV_NAME="mixxx-deps-rel-2.5-arm64-osx-min1100-c9e5580" + BUILDENV_SHA256="1dacff9e73e0267142e16a0d3836000c36cafeb2eeabdbece07db8e339995879" else - BUILDENV_BRANCH="2.4" - BUILDENV_NAME="mixxx-deps-2.4-arm64-osx-min1100-55d482c" - BUILDENV_SHA256="d6a978c3709334135575d3d3e90a00c371215b7be39e3f51b3d63c8e45878056" + BUILDENV_BRANCH="2.5" + BUILDENV_NAME="mixxx-deps-2.5-arm64-osx-min1100-35a3f01" + BUILDENV_SHA256="e0b951f55d496ec5ca4799073b9cc36619057998dceb118c5895ebe08e44669f" fi else if [ -n "${BUILDENV_RELEASE}" ]; then - BUILDENV_BRANCH="2.4-rel" - BUILDENV_NAME="mixxx-deps-rel-2.4-x64-osx-min1012-d5a93e2" - BUILDENV_SHA256="d4129e1d2eaf4236db9ce0e02c63c92cf3385886c08ea5e706475e95e00f3cff" + BUILDENV_BRANCH="2.5-rel" + BUILDENV_NAME="mixxx-deps-rel-2.5-x64-osx-min1012-c9e5580" + BUILDENV_SHA256="23b6d7a99c231c68bf852503e41ce5029f193fc6ed7c2d92341c00c2df935a7c" else - BUILDENV_BRANCH="2.4" - BUILDENV_NAME="mixxx-deps-2.4-x64-osx-min1012-55d482c" - BUILDENV_SHA256="993c0474c3e23e41f1fb22a00aa1fa9cf9cdeebb23b88a840f4c16d674df27cc" + BUILDENV_BRANCH="2.5" + BUILDENV_NAME="mixxx-deps-2.5-x64-osx-min1012-35a3f01" + BUILDENV_SHA256="c28b7fa37321bec2fad5bdeaabae054ba9c8dd85a16b25fc4c7fa2e97f8b40da" fi fi diff --git a/tools/windows_buildenv.bat b/tools/windows_buildenv.bat index 66e22dadc5..ffe34cdd72 100644 --- a/tools/windows_buildenv.bat +++ b/tools/windows_buildenv.bat @@ -21,13 +21,13 @@ IF NOT DEFINED INSTALL_ROOT ( ) IF DEFINED BUILDENV_RELEASE ( - SET BUILDENV_BRANCH=2.4-rel - SET BUILDENV_NAME=mixxx-deps-rel-2.4-x64-windows-d5a93e2 - SET BUILDENV_SHA256=34fc0f6c0771b9c2b1a6b79b05dd166df71704ee0b2af3789f613bebeb305099 + SET BUILDENV_BRANCH=2.5-rel + SET BUILDENV_NAME=mixxx-deps-rel-2.5-x64-windows-c9e5580 + SET BUILDENV_SHA256=85e4d7410ba01ab61e5ef609bd92779267eddee7e235557208d7cf602f49dc5f ) ELSE ( - SET BUILDENV_BRANCH=2.4 - SET BUILDENV_NAME=mixxx-deps-2.4-x64-windows-55d482c - SET BUILDENV_SHA256=a662a483374881a5d7cf9bbde210150d14a3e17e50c974473bfd2cfb8945a67f + SET BUILDENV_BRANCH=2.5 + SET BUILDENV_NAME=mixxx-deps-2.5-x64-windows-35a3f01 + SET BUILDENV_SHA256=6cc95b57dbb8a3e91037dc2d9cf81cbd82602d441a1f5f4a8313bae9a0bace87 ) IF "%~1"=="" ( |