diff --git a/deps.windows/20-freetype.ps1 b/deps.windows/20-freetype.ps1 index 45d7ac7d7..846f9376e 100644 --- a/deps.windows/20-freetype.ps1 +++ b/deps.windows/20-freetype.ps1 @@ -3,7 +3,7 @@ param( [string] $Version = '2.13.1', [string] $Uri = 'https://github.com/freetype/freetype.git', [string] $Hash = 'e4586d960f339cf75e2e0b34aee30a0ed8353c0d', - [array] $Targets = @('x64') + [array] $Targets = @('x64', 'arm64') ) function Setup { diff --git a/deps.windows/30-curl.ps1 b/deps.windows/30-curl.ps1 index d1332a327..699a7baa4 100644 --- a/deps.windows/30-curl.ps1 +++ b/deps.windows/30-curl.ps1 @@ -3,7 +3,7 @@ param( [string] $Version = '8.1.2', [string] $Uri = 'https://github.com/curl/curl.git', [string] $Hash = '7ab9d43720bc34d9aa351c7ca683c1668ebf8335', - [array] $Targets = @('x64') + [array] $Targets = @('x64', 'arm64') ) function Setup { diff --git a/deps.windows/30-jansson.ps1 b/deps.windows/30-jansson.ps1 index ea1a8b336..0f8c9098c 100644 --- a/deps.windows/30-jansson.ps1 +++ b/deps.windows/30-jansson.ps1 @@ -3,7 +3,7 @@ param( [string] $Version = '2.14', [string] $Uri = 'https://github.com/akheron/jansson.git', [string] $Hash = '684e18c927e89615c2d501737e90018f4930d6c5', - [array] $Targets = @('x64') + [array] $Targets = @('x64', 'arm64') ) function Setup { diff --git a/deps.windows/30-rnnoise.ps1 b/deps.windows/30-rnnoise.ps1 index 75b8b363a..d1a1a4710 100644 --- a/deps.windows/30-rnnoise.ps1 +++ b/deps.windows/30-rnnoise.ps1 @@ -3,7 +3,7 @@ param( [string] $Version = '2020-07-28', [string] $Uri = 'https://github.com/xiph/rnnoise.git', [string] $Hash = '2938bcf94a2fe3f850df542f5de3996905059c97', - [array] $Targets = @('x64') + [array] $Targets = @('x64', 'arm64') ) function Setup { diff --git a/deps.windows/30-speexdsp.ps1 b/deps.windows/30-speexdsp.ps1 index a1e06f217..0c737f8c9 100644 --- a/deps.windows/30-speexdsp.ps1 +++ b/deps.windows/30-speexdsp.ps1 @@ -3,7 +3,7 @@ param( [string] $Version = '1.2.1', [string] $Uri = 'https://github.com/xiph/speexdsp.git', [string] $Hash = '1b28a0f61bc31162979e1f26f3981fc3637095c8', - [array] $Targets = @('x64'), + [array] $Targets = @('x64', 'arm64'), [array] $Patches = @( @{ PatchFile = "${PSScriptRoot}/patches/speexdsp/0001-Add-CMakeLists.patch" diff --git a/deps.windows/40-detours.ps1 b/deps.windows/40-detours.ps1 index 45173388b..68db7828e 100644 --- a/deps.windows/40-detours.ps1 +++ b/deps.windows/40-detours.ps1 @@ -2,26 +2,30 @@ param( [string] $Name = 'detours', [string] $Version = '4.0.1', [string] $Uri = 'https://github.com/microsoft/detours.git', - [string] $Hash = 'e4bfd6b03e50de46b47abfbd1e46b384f0c5f833' + [hashtable] $Hashes = @{ + x86 = 'e4bfd6b03e50de46b47abfbd1e46b384f0c5f833' + x64 = 'e4bfd6b03e50de46b47abfbd1e46b384f0c5f833' + arm64 = '734ac64899c44933151c1335f6ef54a590219221' + } ) function Setup { - Setup-Dependency -Uri $Uri -Hash $Hash -DestinationPath $Path + Setup-Dependency -Uri $Uri -Hash $Hash -DestinationPath $Path -Branch main } function Clean { Set-Location $Path $Items = @( - @{ErrorAction = "SilentlyContinue"; Path = "lib.${Target}"} - @{ErrorAction = "SilentlyContinue"; Path = "bin.${Target}"} - @{ErrorAction = "SilentlyContinue"; Path = "src/obj..${Target}"} + @{ErrorAction = "SilentlyContinue"; Path = "lib.$($Target.ToUpper())"} + @{ErrorAction = "SilentlyContinue"; Path = "bin.$($Target.ToUpper())"} + @{ErrorAction = "SilentlyContinue"; Path = "src/obj.$($Target.ToUpper())"} ) $Items | ForEach-Object { $Item = $_ Log-Information "Clean $($Item.Path) (${Target})" - Get-ChildItem @Item | Remove-Item + Get-ChildItem @Item | Remove-Item -Recurse } } diff --git a/deps.windows/40-luajit.ps1 b/deps.windows/40-luajit.ps1 index 85ed6415e..19ecc62e2 100644 --- a/deps.windows/40-luajit.ps1 +++ b/deps.windows/40-luajit.ps1 @@ -2,8 +2,11 @@ param( [string] $Name = 'luajit', [string] $Version = '2.1', [string] $Uri = 'https://github.com/luajit/luajit.git', - [string] $Hash = '8635cbabf3094c4d8bd00578c7d812bea87bb2d3', - [array] $Targets = @('x64') + [hashtable] $Hashes = @{ + x64 = '8635cbabf3094c4d8bd00578c7d812bea87bb2d3' + arm64 = 'e897c5743f97a6b05c59852709092e7da4119914' + }, + [array] $Targets = @('x64', 'arm64') ) function Setup { @@ -19,6 +22,7 @@ function Build { BuildPath = "src" BuildCommand = "cmd.exe /c 'msvcbuild.bat amalg'" Target = $Target + HostArchitecture = $Target } Invoke-DevShell @Params diff --git a/deps.windows/50-bison-bin.ps1 b/deps.windows/50-bison-bin.ps1 index bdd2ccc62..7d2179a83 100644 --- a/deps.windows/50-bison-bin.ps1 +++ b/deps.windows/50-bison-bin.ps1 @@ -3,7 +3,7 @@ param( [string] $Version = '2.4.1', [string] $Uri = 'http://downloads.sourceforge.net/gnuwin32/bison-2.4.1-bin.zip', [string] $Hash = "${PSScriptRoot}/checksums/bison-2.4.1-bin.zip.sha256", - [array] $Targets = @('x64') + [array] $Targets = @('x64', 'arm64') ) function Setup { diff --git a/deps.windows/50-bison-dep.ps1 b/deps.windows/50-bison-dep.ps1 index c1501629d..a4d4dbb3a 100644 --- a/deps.windows/50-bison-dep.ps1 +++ b/deps.windows/50-bison-dep.ps1 @@ -3,7 +3,7 @@ param( [string] $Version = '2.4.1', [string] $Uri = 'http://downloads.sourceforge.net/gnuwin32/bison-2.4.1-dep.zip', [string] $Hash = "${PSScriptRoot}/checksums/bison-2.4.1-dep.zip.sha256", - [array] $Targets = @('x64') + [array] $Targets = @('x64', 'arm64') ) function Setup { diff --git a/deps.windows/50-pcre.ps1 b/deps.windows/50-pcre.ps1 index c1c56d6d7..c68999202 100644 --- a/deps.windows/50-pcre.ps1 +++ b/deps.windows/50-pcre.ps1 @@ -3,7 +3,7 @@ param( [string] $Version = '10.40', [string] $Uri = 'https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.40/pcre2-10.40.zip', [string] $Hash = "${PSScriptRoot}/checksums/pcre2-10.40.zip.sha256", - [array] $Targets = @('x64') + [array] $Targets = @('x64', 'arm64') ) function Setup { diff --git a/deps.windows/50-swig.ps1 b/deps.windows/50-swig.ps1 index a8c9f9bfc..7f69f104e 100644 --- a/deps.windows/50-swig.ps1 +++ b/deps.windows/50-swig.ps1 @@ -3,7 +3,7 @@ param( [string] $Version = '4.1.0', [string] $Uri = 'https://github.com/swig/swig.git', [string] $Hash = "4dd285fad736c014224ef2ad25b85e17f3dce1f9", - [array] $Targets = @('x64'), + [array] $Targets = @('x64', 'arm64'), [array] $Patches = @( @{ PatchFile = "${PSScriptRoot}/patches/swig/0001-add-Python-3-stable-abi.patch" diff --git a/deps.windows/60-asio.ps1 b/deps.windows/60-asio.ps1 index 3ff6f47fc..267c5867e 100644 --- a/deps.windows/60-asio.ps1 +++ b/deps.windows/60-asio.ps1 @@ -3,7 +3,7 @@ param( [string] $Version = '1.28.0', [string] $Uri = 'https://github.com/chriskohlhoff/asio.git', [string] $Hash = "c465349fa5cd91a64bb369f5131ceacab2c0c1c3", - [array] $Targets = @('x64') + [array] $Targets = @('x64', 'arm64') ) function Setup { diff --git a/deps.windows/60-nlohmann-json.ps1 b/deps.windows/60-nlohmann-json.ps1 index 8fa462275..f49b4f45b 100644 --- a/deps.windows/60-nlohmann-json.ps1 +++ b/deps.windows/60-nlohmann-json.ps1 @@ -3,7 +3,7 @@ param( [string] $Version = '3.11.2', [string] $Uri = 'https://github.com/nlohmann/json.git', [string] $Hash = 'bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d', - [array] $Targets = @('x64') + [array] $Targets = @('x64', 'arm64') ) function Setup { diff --git a/deps.windows/60-python.ps1 b/deps.windows/60-python.ps1 index 51f42cf08..c12f65908 100644 --- a/deps.windows/60-python.ps1 +++ b/deps.windows/60-python.ps1 @@ -2,10 +2,11 @@ param( [string] $Name = 'python', [string] $Version = '3.1.1', [string] $Uri = 'https://github.com/pyenv-win/pyenv-win.git', - [string] $Hash = '754a6ca877f66aaa2bd4485a29411267d0705273', - [array] $Targets = @('x64'), + [string] $Hash = '42b208627c2cdc7a55c93fe9c82a9ed4524cd9ea', + [array] $Targets = @('x64', 'arm64'), [hashtable] $PythonVersion = @{ - x64 = '3.8.10' + x64 = '3.8.10' + arm64 = '3.11.0-arm' } ) diff --git a/deps.windows/60-qrcodegencpp.ps1 b/deps.windows/60-qrcodegencpp.ps1 index b2ee07b57..8ffa87623 100644 --- a/deps.windows/60-qrcodegencpp.ps1 +++ b/deps.windows/60-qrcodegencpp.ps1 @@ -5,7 +5,7 @@ param( [string] $Hash = '720f62bddb7226106071d4728c292cb1df519ceb', [string] $UriCMake = 'https://github.com/EasyCoding/qrcodegen-cmake.git', [string] $HashCMake = 'ea5835f7dca5bcf31dc795b1ac61bdc1f15940a7', - [array] $Targets = @('x64') + [array] $Targets = @('x64', 'arm64') ) function Setup { diff --git a/deps.windows/60-websocketpp.ps1 b/deps.windows/60-websocketpp.ps1 index 41d101022..eff46a21a 100644 --- a/deps.windows/60-websocketpp.ps1 +++ b/deps.windows/60-websocketpp.ps1 @@ -3,7 +3,7 @@ param( [string] $Version = '0.8.2', [string] $Uri = 'https://github.com/zaphoyd/websocketpp.git', [string] $Hash = '56123c87598f8b1dd471be83ca841ceae07f95ba', - [array] $Targets = @('x64'), + [array] $Targets = @('x64', 'arm64'), [array] $Patches = @( @{ PatchFile = "${PSScriptRoot}/patches/websocketpp/0001-update-minimum-cmake.patch" diff --git a/deps.windows/60-zstd.ps1 b/deps.windows/60-zstd.ps1 index 99584e533..981d643da 100644 --- a/deps.windows/60-zstd.ps1 +++ b/deps.windows/60-zstd.ps1 @@ -3,7 +3,7 @@ param( [string] $Version = 'v1.5.5', [string] $Uri = 'https://github.com/facebook/zstd.git', [string] $Hash = '63779c798237346c2b245c546c40b72a5a5913fe', - [array] $Targets = @('x64') + [array] $Targets = @('x64', 'arm64') ) function Setup { diff --git a/deps.windows/90-vlc.ps1 b/deps.windows/90-vlc.ps1 index 36cf439cc..b82a1d64f 100644 --- a/deps.windows/90-vlc.ps1 +++ b/deps.windows/90-vlc.ps1 @@ -3,7 +3,7 @@ param( [string] $Version = '3.0.8', [string] $Uri = 'https://cdn-fastly.obsproject.com/downloads/vlc.zip', [string] $Hash = "${PSScriptRoot}/checksums/vlc.zip.sha256", - [array] $Targets = @('x64') + [array] $Targets = @('x64', 'arm64') ) function Setup {