chore(vcpkg): update baseline and dependencies for vcpkg configuration

- Updated the vcpkg baseline and commit ID across configuration files to the latest version for improved compatibility.
- Added SDL2 as a dependency in `vcpkg.json` for Windows platform support.
- Adjusted CI and release workflows to reflect the new vcpkg commit ID, ensuring consistency in the build process.

Benefits:
- Ensures the project utilizes the latest features and fixes from vcpkg, enhancing overall stability and reliability.
- Streamlines the integration of SDL2, improving support for Windows builds.
This commit is contained in:
scawful
2025-10-15 22:58:08 -04:00
parent 3811002d80
commit a4a1fd5fb6
4 changed files with 9 additions and 5 deletions

View File

@@ -79,7 +79,7 @@ jobs:
VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite' VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite'
with: with:
vcpkgDirectory: '${{ github.workspace }}/vcpkg' vcpkgDirectory: '${{ github.workspace }}/vcpkg'
vcpkgGitCommitId: '7ba0ba7334c3346e7eee1e049ba85da193a8d821' # 2025.01.20 release vcpkgGitCommitId: 'b2c74683ecfd6a8e7d27ffb0df077f66a9339509' # 2025.01.20 release
runVcpkgInstall: false # Let CMake handle installation via manifest mode runVcpkgInstall: false # Let CMake handle installation via manifest mode
- name: Retry vcpkg setup (Windows) - name: Retry vcpkg setup (Windows)
@@ -91,7 +91,7 @@ jobs:
VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite' VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite'
with: with:
vcpkgDirectory: '${{ github.workspace }}/vcpkg' vcpkgDirectory: '${{ github.workspace }}/vcpkg'
vcpkgGitCommitId: '7ba0ba7334c3346e7eee1e049ba85da193a8d821' vcpkgGitCommitId: 'b2c74683ecfd6a8e7d27ffb0df077f66a9339509'
runVcpkgInstall: false runVcpkgInstall: false
- name: Resolve vcpkg toolchain (Windows) - name: Resolve vcpkg toolchain (Windows)

View File

@@ -30,7 +30,7 @@ jobs:
uses: lukka/run-vcpkg@v11 uses: lukka/run-vcpkg@v11
with: with:
vcpkgDirectory: '${{ github.workspace }}/vcpkg' vcpkgDirectory: '${{ github.workspace }}/vcpkg'
vcpkgGitCommitId: '7ba0ba7334c3346e7eee1e049ba85da193a8d821' vcpkgGitCommitId: 'b2c74683ecfd6a8e7d27ffb0df077f66a9339509'
runVcpkgInstall: false runVcpkgInstall: false
env: env:
VCPKG_DEFAULT_TRIPLET: x64-windows-static VCPKG_DEFAULT_TRIPLET: x64-windows-static

View File

@@ -3,7 +3,7 @@
"default-registry": { "default-registry": {
"kind": "git", "kind": "git",
"repository": "https://github.com/microsoft/vcpkg", "repository": "https://github.com/microsoft/vcpkg",
"baseline": "7ba0ba7334c3346e7eee1e049ba85da193a8d821" "baseline": "b2c74683ecfd6a8e7d27ffb0df077f66a9339509"
}, },
"registries": [] "registries": []
} }

View File

@@ -3,8 +3,12 @@
"name": "yaze", "name": "yaze",
"version": "0.3.2", "version": "0.3.2",
"description": "Yet Another Zelda3 Editor", "description": "Yet Another Zelda3 Editor",
"builtin-baseline": "7ba0ba7334c3346e7eee1e049ba85da193a8d821", "builtin-baseline": "b2c74683ecfd6a8e7d27ffb0df077f66a9339509",
"dependencies": [ "dependencies": [
{
"name": "sdl2",
"platform": "windows"
},
{ {
"name": "yaml-cpp", "name": "yaml-cpp",
"platform": "windows" "platform": "windows"