diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2021-02-22 21:02:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-22 21:02:20 +0100 |
| commit | 79471f1c0e0ffead813b37d6442a2d7efa1d3422 (patch) | |
| tree | 26d28500010c6837cbb750b09d354dff8b7cb760 /.github | |
| parent | 2b0db2a92924c877163626cbc166876afadc8a2b (diff) | |
| parent | 3133372e05a9f0f0293aaea59dadfc01e5eb0601 (diff) | |
Merge pull request #3615 from Be-ing/fdk-aac_rebase
fdk-aac encoder + libshout-idjc + vcpkg Windows dependencies integration
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build-checks.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/build.yml | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/.github/workflows/build-checks.yml b/.github/workflows/build-checks.yml index 11672b71d5..703d4e88e3 100644 --- a/.github/workflows/build-checks.yml +++ b/.github/workflows/build-checks.yml @@ -38,7 +38,7 @@ jobs: libqt5svg5-dev \ libqt5x11extras5-dev \ librubberband-dev \ - libshout3-dev \ + libshout-idjc-dev \ libsndfile1-dev \ libsoundtouch-dev \ libsqlite3-dev \ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c524dfbcbe..cf71fd9b90 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,6 @@ jobs: cmake_args: >- -DWARNINGS_FATAL=ON -DFAAD=ON - -DKEYFINDER=ON -DLOCALECOMPARE=ON -DMAD=ON -DMODPLUG=ON @@ -78,7 +77,6 @@ jobs: -DLOCALECOMPARE=ON -DMAD=ON -DMEDIAFOUNDATION=ON - -DSTATIC_DEPS=ON cc: cl cxx: cl cmake_generator: Ninja @@ -113,7 +111,7 @@ jobs: with: # This should always match the mininum required version in # our CMakeLists.txt - cmake-version: '3.13.x' + cmake-version: '3.15.x' - name: "[Windows] Install additional build tools" if: runner.os == 'Windows' |