diff --git a/.github/workflows/full_win64.yml b/.github/workflows/full_win64.yml index c3ad33af9..010d072cb 100644 --- a/.github/workflows/full_win64.yml +++ b/.github/workflows/full_win64.yml @@ -11,6 +11,10 @@ jobs: windows-full-build: runs-on: windows-2019 + strategy: + matrix: + msvc-version: [2022] + defaults: run: shell: msys2 {0} @@ -23,6 +27,13 @@ jobs: - name: Setup environment uses: ilammy/msvc-dev-cmd@v1 + with: + vs-version: ${{ matrix.msvc-version }} + arch: x64 + + - name: Configure MSBuild to use vc143 toolset + run: | + echo ::add-path::C:\Program Files (x86)\Microsoft Visual Studio\${{ matrix.msvc-version }}\Community\VC\Tools\MSVC\14.31.31103\bin\Hostx64\x64 - name: Setup MSYS uses: msys2/setup-msys2@v2 diff --git a/bin/compile_ffmpeg_windows.sh b/bin/compile_ffmpeg_windows.sh index ee94734a6..17ed3dfaa 100755 --- a/bin/compile_ffmpeg_windows.sh +++ b/bin/compile_ffmpeg_windows.sh @@ -243,7 +243,6 @@ if [[ $TLRENDER_VPX == ON || $TLRENDER_VPX == 1 ]]; then --disable-unit-tests \ --disable-examples \ --disable-docs - devenv vpx.sln -Upgrade make -j ${CPU_CORES} make install run_cmd mv $INSTALL_DIR/lib/x64/vpxmd.lib $INSTALL_DIR/lib/vpx.lib