Skip to content

Commit

Permalink
Merge branch 'release/6.16.0' of https://github.com/csound/csound int…
Browse files Browse the repository at this point in the history
…o release/6.16.0
  • Loading branch information
vlazzarini committed Jun 10, 2021
2 parents 2dc8a98 + 2c5687b commit d5dba04
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions msvc/downloadDependencies.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ param
# Only libsndfile is static, all others are dynamically linked
$targetTriplet = "x64-windows-csound"

$vcpkgVersion = "680b27d15f4d62bc6181fd33dc5259482b0890b1"

echo "Downloading Csound dependencies..."
echo "vsGenerator: $vsGenerator"
echo "Build type: $targetTriplet"
Expand All @@ -29,7 +31,7 @@ if ($systemVCPKG) {
cd $vcpkgDir
# Update and rebuild vcpkg
git pull
git checkout bfe983d
git checkout $vcpkgVersion
bootstrap-vcpkg.bat
# Remove any outdated packages (they will be installed again below)
vcpkg remove --outdated --recurse
Expand All @@ -44,7 +46,7 @@ elseif (Test-Path "..\..\vcpkg") {
echo "vcpkg already installed locally, updating"
# Update and rebuild vcpkg
git pull
git checkout bfe983d
git checkout $vcpkgVersion
bootstrap-vcpkg.bat
# Remove any outdated packages (they will be installed again below)
vcpkg remove --outdated --recurse
Expand All @@ -54,9 +56,9 @@ elseif (Test-Path "..\..\vcpkg") {
else {
cd ..\..
echo "vcpkg missing, downloading and installing..."
git clone --depth 1 http://github.com/Microsoft/vcpkg.git
git clone http://github.com/Microsoft/vcpkg.git
cd vcpkg
git checkout bfe983d
git checkout $vcpkgVersion
$env:Path += ";" + $(Get-Location)
$vcpkgDir = $(Get-Location)
[Environment]::SetEnvironmentVariable("VCPKGDir", $env:vcpkgDir, [EnvironmentVariableTarget]::User)
Expand Down

0 comments on commit d5dba04

Please sign in to comment.