Merge branch 'master' into naval-warfare-campaign-off

widelands · Mar 1, 2024 · 5f59e70 · 5f59e70
2 parents 490f091 + fceb416
commit 5f59e70
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/build_windows_msvc.yaml b/.github/workflows/build_windows_msvc.yaml
@@ -34,7 +34,8 @@ jobs:
     - name: Restore vcpkg and its artifacts.
       uses: actions/cache@v4
       with:
-        path: ${{ env.VCPKG_ROOT }}\installed
+        # Explicit path here because env is overridden by msvc-dev-cmd
+        path: C:\vcpkg\installed
         key: |
           ${{ steps.prepare.outputs.vcpkg_key }}-${{ matrix.arch }}
     - name: Installing dependencies

diff --git a/install-dependencies.sh b/install-dependencies.sh
@@ -196,7 +196,7 @@ elif [ "$DISTRO" = "void" ]; then
 
 elif [ "$DISTRO" = "vcpkg" ]; then
    echo "Installing dependencies for vcpkg..."
-   vcpkg install --disable-metrics $@ asio gettext libpng icu glbinding sdl2 sdl2-ttf \
+   vcpkg install --disable-metrics $@ asio gettext[tools] libpng icu glbinding sdl2 sdl2-ttf \
      sdl2-mixer[libflac,mpg123] sdl2-image[libjpeg-turbo,tiff] graphite2 \
      harfbuzz opusfile libwebp