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

Optimize windows build #2062

Merged
merged 1 commit into from
Oct 18, 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
2 changes: 1 addition & 1 deletion bin/install_prerequisites_windows.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ git -C ((Get-command vcpkg).Source | Split-Path) pull
$vcpkg_dir=(Get-command vcpkg).Source

vcpkg install curl:x64-windows || true
vcpkg install libxml2:x64-windows || true
vcpkg install libxml2[core,iconv]:x64-windows || true

vcpkg update
if ($LASTEXITCODE) { Throw }
Expand Down
5 changes: 0 additions & 5 deletions bin/windows/hurl.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,6 @@ SectionGroup "dlls"
SetOutPath $INSTDIR
File "libxml2.dll"
SectionEnd
Section "liblzma.dll"
SectionIn RO
SetOutPath $INSTDIR
File "liblzma.dll"
SectionEnd
Section "zlib1.dll"
SectionIn RO
SetOutPath $INSTDIR
Expand Down
3 changes: 2 additions & 1 deletion contrib/windows/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";"
Install build libs requirement

```pwsh
vcpkg install libxml2:x64-windows curl:x64-windows
vcpkg install curl:x64-windows
vcpkg install libxml2[core,iconv]:x64-windows
vcpkg integrate install
Set-ItemProperty -Path HKCU:\Environment -Name VCPKGRS_DYNAMIC -Value "1"
$env:VCPKGRS_DYNAMIC = [System.Environment]::GetEnvironmentVariable("VCPKGRS_DYNAMIC","User")
Expand Down
Loading