Skip to content

Commit

Permalink
Merge pull request mixxxdj#11834 from daschuer/vcpkg_update_24
Browse files Browse the repository at this point in the history
Update to vcpkg environment with benchmark and libdjinterop 0.19.2
  • Loading branch information
JoergAtGithub authored Aug 17, 2023
2 parents 28ad941 + 7fcee27 commit a4fc67c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
16 changes: 8 additions & 8 deletions tools/macos_buildenv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,22 @@ 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-8b09457"
BUILDENV_SHA256="4f11969c161de83685a164bdb720a4341f9b8d152f21f304976bf36b8f50ca2f"
BUILDENV_NAME="mixxx-deps-rel-2.4-arm64-osx-min1100-37d19ef"
BUILDENV_SHA256="5715c857472bad0cf8062d41835a3be9be7bad7a521bad9a248370b6c641670e"
else
BUILDENV_BRANCH="2.4"
BUILDENV_NAME="mixxx-deps-2.4-arm64-osx-min1100-61b0d50"
BUILDENV_SHA256="604c9abd8d5e669b24e98d7b40b296c7fead5167182af23024c01c8a0a74adee"
BUILDENV_NAME="mixxx-deps-2.4-arm64-osx-min1100-5816327"
BUILDENV_SHA256="fea46fc81f53fd72b94b4c612abbbad59e21a267adf2d16bdcf133114ffd61d2"
fi
else
if [ -n "${BUILDENV_RELEASE}" ]; then
BUILDENV_BRANCH="2.4-rel"
BUILDENV_NAME="mixxx-deps-rel-2.4-x64-osx-min1012-8b09457"
BUILDENV_SHA256="c38ead596098dfa4dfc42919de903629247b3bb75e20b384f69d4b1bc5b9df8d"
BUILDENV_NAME="mixxx-deps-rel-2.4-x64-osx-min1012-37d19ef"
BUILDENV_SHA256="d6a721e2ba6cbce01c270fbe04602adff94e8831769e68a27d5099d03979a4dd"
else
BUILDENV_BRANCH="2.4"
BUILDENV_NAME="mixxx-deps-2.4-x64-osx-min1012-61b0d50"
BUILDENV_SHA256="fda61cf347091884eca6e0bb76945cfed497442ba1a632bbcd1a703a8378efec"
BUILDENV_NAME="mixxx-deps-2.4-x64-osx-min1012-5816327"
BUILDENV_SHA256="a908847cb0a04cb646b5d6eb8b5e3ee6cdde85a1838a9ed12e9a93990258bb94"
fi
fi

Expand Down
8 changes: 4 additions & 4 deletions tools/windows_buildenv.bat
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ 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-8b09457
SET BUILDENV_SHA256=7e729ea3fb8b76fcc1cf473d35b61341fc81337a0f89d1c6913a87946ba5e115
SET BUILDENV_NAME=mixxx-deps-rel-2.4-x64-windows-37d19ef
SET BUILDENV_SHA256=b4872736ed8c1bcc0973abe6dd942b1b0a583e127fa081ff872bf087d145036d
) ELSE (
SET BUILDENV_BRANCH=2.4
SET BUILDENV_NAME=mixxx-deps-2.4-x64-windows-61b0d50
SET BUILDENV_SHA256=b64a0c415dcf57ae86c3b16bf74ad63d5216fcf8e356c764023953be63f45cce
SET BUILDENV_NAME=mixxx-deps-2.4-x64-windows-5816327
SET BUILDENV_SHA256=ad593b11fa4aecd0e2c1a0098812b3f860fe834c98fbbaf3c1b11acefea8adc4
)

IF "%~1"=="" (
Expand Down

0 comments on commit a4fc67c

Please sign in to comment.