Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

macOS scrollbar patch via vcpkg update #11669

Merged
merged 1 commit into from
Jun 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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-d5a93e2"
BUILDENV_SHA256="445a50bde14214b3fef718bf73a6dff721f0681bc582c04b872d5912bc1ae794"
BUILDENV_NAME="mixxx-deps-rel-2.4-arm64-osx-min1100-cc3c615"
BUILDENV_SHA256="da169b5b575390fb1d3b0e58e81959e45e2dc6ab89a8619ab5cdd69631260734"
else
BUILDENV_BRANCH="2.4"
BUILDENV_NAME="mixxx-deps-2.4-arm64-osx-min1100-55d482c"
BUILDENV_SHA256="d6a978c3709334135575d3d3e90a00c371215b7be39e3f51b3d63c8e45878056"
BUILDENV_NAME="mixxx-deps-2.4-arm64-osx-min1100-834882e"
BUILDENV_SHA256="99e37d4a292515e787dda421c1e15257502d6b0332fa0e2d0a65b19de3782470"
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_NAME="mixxx-deps-rel-2.4-x64-osx-min1012-cc3c615"
BUILDENV_SHA256="06f408207be1fdb4b82bc8da3115746643e23cf3c7ccad59a17c6eb1a65907aa"
else
BUILDENV_BRANCH="2.4"
BUILDENV_NAME="mixxx-deps-2.4-x64-osx-min1012-55d482c"
BUILDENV_SHA256="993c0474c3e23e41f1fb22a00aa1fa9cf9cdeebb23b88a840f4c16d674df27cc"
BUILDENV_NAME="mixxx-deps-2.4-x64-osx-min1012-834882e"
BUILDENV_SHA256="e47ec569ba34d0dfe1e882e323b1bbfda09465bc2afe4489d358ba1c6ce1ab1e"
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-d5a93e2
SET BUILDENV_SHA256=34fc0f6c0771b9c2b1a6b79b05dd166df71704ee0b2af3789f613bebeb305099
SET BUILDENV_NAME=mixxx-deps-rel-2.4-x64-windows-cc3c615
SET BUILDENV_SHA256=8dc62c5aad36082b484145175888f3563e52deef2f8dfb78c9f83c3462d3d6e7
) ELSE (
SET BUILDENV_BRANCH=2.4
SET BUILDENV_NAME=mixxx-deps-2.4-x64-windows-55d482c
SET BUILDENV_SHA256=a662a483374881a5d7cf9bbde210150d14a3e17e50c974473bfd2cfb8945a67f
SET BUILDENV_NAME=mixxx-deps-2.4-x64-windows-834882e
SET BUILDENV_SHA256=ae15dc905a6ebd437a15a4d7616a9489233fe45b740e238562db0d2ee4680b84
)

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