Update vcpkg to new mainline commit and instructions

CleverRaven · Dec 13, 2024 · 30e31b2 · 30e31b2
1 parent 791bd3f
commit 30e31b2
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 191 deletions.
diff --git a/.github/vcpkg_ports/sdl2/deps.patch b/.github/vcpkg_ports/sdl2/deps.patch
diff --git a/.github/vcpkg_ports/sdl2/portfile.cmake b/.github/vcpkg_ports/sdl2/portfile.cmake
diff --git a/.github/vcpkg_ports/sdl2/usage b/.github/vcpkg_ports/sdl2/usage
diff --git a/.github/vcpkg_ports/sdl2/vcpkg.json b/.github/vcpkg_ports/sdl2/vcpkg.json
diff --git a/.github/workflows/msvc-full-features.yml b/.github/workflows/msvc-full-features.yml
@@ -86,7 +86,7 @@ jobs:
       id: runvcpkg
       with:
         vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
-        vcpkgGitCommitId: '66444e13a86da7087ee24c342f91801cc6eb9877'
+        vcpkgGitCommitId: '3b57fb2e1ff55613db14d2aaf0a30529289c7050'
 
     - name: Integrate vcpkg
       run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -172,7 +172,7 @@ jobs:
         id: runvcpkg
         with:
           vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
-          vcpkgGitCommitId: '66444e13a86da7087ee24c342f91801cc6eb9877'
+          vcpkgGitCommitId: '3b57fb2e1ff55613db14d2aaf0a30529289c7050'
       - name: Install dependencies (windows msvc) (3/4)
         if: runner.os == 'Windows'
         run: |

diff --git a/doc/COMPILING/COMPILING-VS-VCPKG.md b/doc/COMPILING/COMPILING-VS-VCPKG.md
@@ -22,7 +22,7 @@ Steps from current guide were tested on Windows 10 (64 bit), Visual Studio 2019
 
 2. Install `Git for Windows` (installer can be downloaded from [Git homepage](https://git-scm.com/)).
 
-3. Install and configure `vcpkg`. If you already have `vcpkg` installed, you should update it to at least commit `66444e13a86da7087ee24c342f91801cc6eb9877` (the most recent tested good revision) and rerun `.\bootstrap-vcpkg.bat` as described:
+3. Install and configure `vcpkg`. If you already have `vcpkg` installed, you should update it to at least commit `3b57fb2e1ff55613db14d2aaf0a30529289c7050` (the most recent tested good revision) and rerun `.\bootstrap-vcpkg.bat` as described:
 
 ***WARNING: It is important that, wherever you decide to clone this repo, the path does not include whitespace. That is, `C:/dev/vcpkg` is acceptable, but `C:/dev test/vcpkg` is not.***
 
@@ -31,18 +31,18 @@ In a `cmd.exe` shell:
 REM cd to the appropriate folder first
 git clone https://github.com/Microsoft/vcpkg.git
 cd vcpkg
+git checkout 3b57fb2e1ff55613db14d2aaf0a30529289c7050
 .\bootstrap-vcpkg.bat -disableMetrics
 .\vcpkg integrate install
-git checkout 66444e13a86da7087ee24c342f91801cc6eb9877
 ```
 In a Git Bash shell, the commands are almost the same except the filesystem path separator is `/` instead of `\`.
 ```cmd
 # cd to the appropriate folder first
 git clone https://github.com/Microsoft/vcpkg.git
 cd vcpkg
+git checkout 3b57fb2e1ff55613db14d2aaf0a30529289c7050
 ./bootstrap-vcpkg.bat -disableMetrics
 ./vcpkg.exe integrate install
-git checkout 66444e13a86da7087ee24c342f91801cc6eb9877
 ```
 
 ## Cloning and compilation:

diff --git a/msvc-full-features/Cataclysm-common.props b/msvc-full-features/Cataclysm-common.props
@@ -104,23 +104,25 @@
         $(ProjectDir)vcpkg_installed\$(VcpkgTripet)\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories)
       </AdditionalLibraryDirectories>
       <AdditionalDependencies>
-        brotlicommon-static.lib;
-        brotlidec-static.lib;
-        brotlienc-static.lib;
+        brotlicommon.lib;
+        brotlidec.lib;
+        brotlienc.lib;
         bz2$(VcpkgLibSuffix).lib;
         FLAC.lib;
         FLAC++.lib;
         freetype$(VcpkgLibSuffix).lib;
         jpeg.lib;
         libpng16$(VcpkgLibSuffix).lib;
+        libwavpack.lib;
+        libxmp-static.lib;
         modplug.lib;
         mpg123.lib;
         ogg.lib;
         out123.lib;
         pdcurses.lib;
         SDL2_image-static$(VcpkgLibSuffix).lib;
         SDL2_mixer-static$(VcpkgLibSuffix).lib;
-        SDL2_ttf.lib;
+        SDL2_ttf$(VcpkgLibSuffix).lib;
         SDL2-static$(VcpkgLibSuffix).lib;
         syn123.lib;
         turbojpeg.lib;

diff --git a/msvc-full-features/vcpkg.json b/msvc-full-features/vcpkg.json
@@ -13,10 +13,5 @@
         },
         "sdl2-ttf",
         "pdcurses"
-    ],
-    "vcpkg-configuration": {
-        "overlay-ports": [
-            "../.github/vcpkg_ports"
-        ]
-    }
+    ]
 }