diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-03-15 13:09:35 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-03-15 13:09:35 +0100 |
| commit | f0380049c887971157b382ec333500c86259ade0 (patch) | |
| tree | 66d6807e107db2648c72f996065a2c98bfb705ca /.github | |
| parent | 8d1a41c3b7ad327ff256d8a40a338b303fcf161a (diff) | |
| download | MPC-f0380049c887971157b382ec333500c86259ade0.tar.gz | |
Support and test zlib on windows
* .github/workflows/windows.yml:
* config/zlib.mpb:
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/windows.yml | 9 |
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: | |