diff --git a/.github/workflows/build-libs.yml b/.github/workflows/build-libs.yml index cbc69dc..ce9e05d 100644 --- a/.github/workflows/build-libs.yml +++ b/.github/workflows/build-libs.yml @@ -104,32 +104,21 @@ jobs: strategy: matrix: include: - - triplet: "x64-windows-static" + - triplet: "x64-windows" libname: "libsndfile_x64.dll" - build-system: cmake - cmake-options: >- - -DBUILD_SHARED_LIBS=ON - - triplet: "x86-windows-static" + - triplet: "x86-windows" libname: "libsndfile_x86.dll" - build-system: cmake - cmake-options: >- - -DBUILD_SHARED_LIBS=ON - - triplet: "arm64-windows-static" + - triplet: "arm64-windows" libname: "libsndfile_arm64.dll" - build-system: cmake - cmake-options: >- - -DBUILD_SHARED_LIBS=ON fail-fast: false - env: - VCPKG_KEEP_ENV_VARS: CFLAGS;CXXFLAGS - CFLAGS: -DBUILD_SHARED_LIBS=ON - CXXFLAGS: -DBUILD_SHARED_LIBS=ON steps: - uses: actions/checkout@v3 - name: Update VCPKG run: "vcpkg update" + - name: Install dependencies + run: vcpkg install libvorbis:${{ matrix.triplet }}-static libflac:${{ matrix.triplet }}-static opus:${{ matrix.triplet }}-static mp3lame:${{ matrix.triplet }}-static mpg123:${{ matrix.triplet }}-static libvorbis:${{ matrix.triplet }}-static libflac:${{ matrix.triplet }}-static opus:${{ matrix.triplet }}-static mp3lame:${{ matrix.triplet }}-static mpg123:${{ matrix.triplet }}-static - name: Build library - run: "vcpkg install libsndfile:${{ matrix.triplet }} --overlay-triplets=triplets" + run: "vcpkg install libsndfile:${{ matrix.triplet }}" - name: Debug Output 0 run: "dir c:/vcpkg/installed/${{ matrix.triplet }}/share" - name: Debug Output 1 @@ -137,7 +126,7 @@ jobs: - name: Debug Output 2 run: "dir c:/vcpkg/installed/${{ matrix.triplet }}/" - name: Copy library - run: "Copy-Item c:/vcpkg/installed/x64-windows/bin/sndfile.dll -Destination ${{ matrix.libname }}" + run: "Copy-Item c:/vcpkg/installed/${{ matrix.triplet }}/bin/sndfile.dll -Destination ${{ matrix.libname }}" - uses: actions/upload-artifact@v3 with: name: lib-windows