summaryrefslogtreecommitdiff
path: root/.github/workflows/windows.yml
diff options
context:
space:
mode:
Diffstat (limited to '.github/workflows/windows.yml')
-rw-r--r--.github/workflows/windows.yml9
1 files changed, 6 insertions, 3 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 1c0e091c..e04215dc 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -18,7 +18,7 @@ jobs:
BuildConfiguration: Debug
vcpkgarch: x64-windows
vcpkglibdir: debug/lib
- vcpkgpackages: openssl xerces-c
+ vcpkgpackages: openssl xerces-c zlib
- name: VS2019Debug64
vmimage: windows-2019
mpctype: vs2019
@@ -26,7 +26,7 @@ jobs:
BuildConfiguration: Debug
vcpkgarch: x64-windows
vcpkglibdir: debug/lib
- vcpkgpackages: openssl xerces-c
+ vcpkgpackages: openssl xerces-c zlib
- name: VS2019Release32
vmimage: windows-2019
mpctype: vs2019
@@ -34,7 +34,7 @@ jobs:
BuildConfiguration: Release
vcpkgarch: x86-windows
vcpkglibdir: lib
- vcpkgpackages: openssl xerces-c
+ vcpkgpackages: openssl xerces-c zlib
runs-on: ${{ matrix.vmimage }}
name: ${{ matrix.name }}
env:
@@ -47,6 +47,8 @@ jobs:
XERCESC_LIBDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }}
SSL_INCDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/include
SSL_LIBDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }}
+ ZLIB_INCDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/include
+ ZLIB_LIBDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }}
steps:
- name: checkout MPC
uses: actions/checkout@v2
@@ -73,6 +75,7 @@ jobs:
echo "ssl=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
echo "openssl11=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
echo "versioned_namespace=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
+ echo "zlib=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
shell: pwsh
- name: Add optional features ${{ matrix.OptionalFeatures }}
run: |