Skip to content

Commit

Permalink
Update to lates VCPKG environment that does not install the qml folde…
Browse files Browse the repository at this point in the history
…r on Windows
  • Loading branch information
daschuer committed Jan 16, 2024
1 parent df18e1f commit f8440e6
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 @@ -23,25 +23,25 @@ if [ -n "${BUILDENV_ARM64}" ]; then
if [ -n "${BUILDENV_RELEASE}" ]; then
VCPKG_TARGET_TRIPLET="arm64-osx-min1100-release"
BUILDENV_BRANCH="2.4-rel"
BUILDENV_NAME="mixxx-deps-2.4-$VCPKG_TARGET_TRIPLET-fb257ea"
BUILDENV_SHA256="394090e924ea3be63d77d19b36960538c5dbedab12bb01852791f5e7cf615753"
BUILDENV_NAME="mixxx-deps-2.4-$VCPKG_TARGET_TRIPLET-5940548"
BUILDENV_SHA256="ffd756acac4a9c83789b4f0babff0fb3609ca2344a9420ff12f30ffa96cf34d3"
else
VCPKG_TARGET_TRIPLET="arm64-osx-min1100"
BUILDENV_BRANCH="2.4"
BUILDENV_NAME="mixxx-deps-2.4-$VCPKG_TARGET_TRIPLET-6b24c46"
BUILDENV_SHA256="f28cfd8b57a9fa3c73398365226e9dc3b5ac64afeb4eec20ad75c1108340c506"
BUILDENV_NAME="mixxx-deps-2.4-$VCPKG_TARGET_TRIPLET-24ad21f"
BUILDENV_SHA256="cefbb728f42367e722a4001502bfd5a5fed6fbdbdde85c7f08b90c21bafa4915"
fi
else
if [ -n "${BUILDENV_RELEASE}" ]; then
VCPKG_TARGET_TRIPLET="x64-osx-min1012-release"
BUILDENV_BRANCH="2.4-rel"
BUILDENV_NAME="mixxx-deps-2.4-$VCPKG_TARGET_TRIPLET-fb257ea"
BUILDENV_SHA256="7fb8a6e66bbcce4e9245e015f70f68946d6ae56616aeb62b21058c57ead4232a"
BUILDENV_NAME="mixxx-deps-2.4-$VCPKG_TARGET_TRIPLET-5940548"
BUILDENV_SHA256="cafc88109d55363e6681b949bf3943396ab6f1a44da211f575bdb52db7933477"
else
VCPKG_TARGET_TRIPLET="x64-osx-min1012"
BUILDENV_BRANCH="2.4"
BUILDENV_NAME="mixxx-deps-2.4-$VCPKG_TARGET_TRIPLET-6b24c46"
BUILDENV_SHA256="ce4ccf5ebdea5713fba47fcde8ced250345cbfc096c5d28fc24188d9b6aeca39"
BUILDENV_NAME="mixxx-deps-2.4-$VCPKG_TARGET_TRIPLET-24ad21f"
BUILDENV_SHA256="6f05f3094a142c92e0f1fa76631c046dd2f4e70bafb9e7f0380c2bb8d115a342"
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 @@ -23,13 +23,13 @@ IF NOT DEFINED INSTALL_ROOT (
IF DEFINED BUILDENV_RELEASE (
SET BUILDENV_BRANCH=2.4-rel
set VCPKG_TARGET_TRIPLET=x64-windows-release
SET BUILDENV_NAME=mixxx-deps-2.4-x64-windows-release-fb257ea
SET BUILDENV_SHA256=c5b16523b11a1f4068b5c9307f01c2cbd1312d9adb1a11aff96f447959d95ad8
SET BUILDENV_NAME=mixxx-deps-2.4-x64-windows-release-5940548
SET BUILDENV_SHA256=cb44696a981f23dfcb3abce810bd3354cec3c25b8d7eea62f3176bc9b64d6bf9
) ELSE (
SET BUILDENV_BRANCH=2.4
set VCPKG_TARGET_TRIPLET=x64-windows
SET BUILDENV_NAME=mixxx-deps-2.4-x64-windows-6b24c46
SET BUILDENV_SHA256=5993f3095485c5067049eb9e059a8cc88690d2eea77e854df792be6a377d81de
SET BUILDENV_NAME=mixxx-deps-2.4-x64-windows-24ad21f
SET BUILDENV_SHA256=27d104d6d5ad56bf52e750643b924f0bf1c40672b370c05569a622f372ccc527
)

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

0 comments on commit f8440e6

Please sign in to comment.