From ab49ecf14f0cd25b305d41417bd1db304676967d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Damstedt=20Rasmussen?= <contact@bearware.dk>
Date: Sun, 24 Oct 2021 19:47:50 +0200
Subject: [PATCH] Install MSYS2 for 'bash.exe' and VCPKG for 'yasm.exe'

---
 .github/workflows/windows.yml | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 3b7efeaf7b..1762ef5551 100755
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -63,6 +63,22 @@ jobs:
       shell: cmd
       run: set
 
+    - name: Setup msbuild in PATH
+      uses: microsoft/setup-msbuild@v1
+
+    - name: Install MSYS2
+      uses: msys2/setup-msys2@v2
+      with:
+        msystem: ${{ matrix.msystem }}
+        path-type: inherit
+        install: make
+
+    - name: Install YASM for libvpx compilation
+      shell: cmd
+      run: |
+        vcpkg install --recurse yasm --triplet ${{ matrix.vcpkgarch }} --clean-after-build
+        echo %VCPKG_INSTALLATION_ROOT%\installed\${{ matrix.vcpkgarch }}\tools\yasm>> %GITHUB_PATH%
+
     - name: Init TeamTalk Client submodules
       working-directory: ${{runner.workspace}}/TeamTalk5
       run: |
@@ -75,9 +91,7 @@ jobs:
         cmake -S TeamTalk5 -B output -A ${{ matrix.cmakeplatform }}
         -DCATCH_UNITTEST=ON
         -DCATCH_UNITTEST_PERF=OFF
-        -DFEATURE_LIBVPX=OFF
         -DFEATURE_WEBRTC=OFF
-        -DTOOLCHAIN_LIBVPX=OFF
         -DBUILD_TEAMTALK_CLIENT_DOTNET_EXAMPLE=OFF
         -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-teamtalk