Merge pull request CleverRaven#79178 from moxian/vcpkg-vs-fixup

Fix MSVC build with lld linker
marilynias · Jan 16, 2025 · 29f0366 · 29f0366
2 parents b050729 + d453b93
commit 29f0366
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/msvc-full-features/Cataclysm-common.props b/msvc-full-features/Cataclysm-common.props
@@ -113,8 +113,6 @@
         freetype$(VcpkgLibSuffix).lib;
         jpeg.lib;
         libpng16$(VcpkgLibSuffix).lib;
-        libwavpack.lib;
-        libxmp-static.lib;
         modplug.lib;
         mpg123.lib;
         ogg.lib;

diff --git a/msvc-full-features/vcpkg.json b/msvc-full-features/vcpkg.json
@@ -20,5 +20,5 @@
           "version>=": "3.9#4"
         }
     ],
-    "builtin-baseline": "5b11232d00476c66724c81adfe5e3777a9aec38f"
+    "builtin-baseline": "3acb7541e854452d33f71037a8f63a88899e63d3"
 }