Skip to content

Commit 34dc70c

Browse files
authored
Merge pull request #246 from jwillemsen/jwi-vcpkg20260427
Upgrade to vcpkg 2026.04.27
2 parents a5bd0e1 + b0bbd9c commit 34dc70c

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

.github/workflows/windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
- name: Install vcpkg
6868
uses: lukka/run-vcpkg@v11
6969
with:
70-
vcpkgGitCommitId: c3867e714dd3a51c272826eea77267876517ed99
70+
vcpkgGitCommitId: 56bb2411609227288b70117ead2c47585ba07713
7171
runVcpkgInstall: true
7272
- name: create $ACE_ROOT/ace/config.h
7373
run: |

config/zlib.mpb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ feature(zlib) {
1414
macros += ZLIB
1515

1616
specific(prop:windows) {
17-
Debug::lit_libs += zlibd
18-
Release::lit_libs += zlib
17+
Debug::lit_libs += zd
18+
Release::lit_libs += z
1919
} else {
2020
lit_libs += z
2121
}

0 commit comments

Comments
 (0)