diff --git a/.github/workflows/Windows_MSVC_x64.yml b/.github/workflows/Windows_MSVC_x64.yml index 4374d83ea..0d9b659cf 100644 --- a/.github/workflows/Windows_MSVC_x64.yml +++ b/.github/workflows/Windows_MSVC_x64.yml @@ -42,7 +42,7 @@ jobs: - name: Restore or setup vcpkg uses: lukka/run-vcpkg@v11.6 with: - vcpkgGitCommitId: 'a62ce77d56ee07513b4b67de1ec2daeaebfae51a' + vcpkgGitCommitId: '40f3c709db80acf154ac4b17a1f83c564ebd022e' - name: Fetch test data run: | diff --git a/vcpkg.json b/vcpkg.json index 2c7290842..aa825ab2a 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,50 +1,57 @@ { - "name": "devilutionx", - "version-string": "1.6.0", - "dependencies": [ - "bzip2", - "lua", - "magic-enum" - ], - "builtin-baseline": "a62ce77d56ee07513b4b67de1ec2daeaebfae51a", - "features": { - "sdl1": { - "description": "Use SDL1.2 instead of SDL2", - "dependencies": [ - "sdl1", - "libpng" - ] - }, - "sdl2": { - "description": "Use SDL2", - "dependencies": [ - "sdl2", - "sdl2-image" - ] - }, - "encryption": { - "description": "Build libsodium for packet encryption", - "dependencies": [ - "libsodium" - ] - }, - "translations": { - "description": "Build translation files", - "dependencies": [ - { - "name": "gettext", - "features": [ - "tools" - ] - } - ] - }, - "tests": { - "description": "Build tests", - "dependencies": [ - "gtest", - "benchmark" - ] - } - } + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", + "name": "devilutionx", + "version-string": "1.6.0", + "dependencies": [ + "bzip2", + "lua", + "magic-enum" + ], + "builtin-baseline": "40f3c709db80acf154ac4b17a1f83c564ebd022e", + "overrides": [ + { + "name": "lua", + "version": "5.4.6" + } + ], + "features": { + "sdl1": { + "description": "Use SDL1.2 instead of SDL2", + "dependencies": [ + "sdl1", + "libpng" + ] + }, + "sdl2": { + "description": "Use SDL2", + "dependencies": [ + "sdl2", + "sdl2-image" + ] + }, + "encryption": { + "description": "Build libsodium for packet encryption", + "dependencies": [ + "libsodium" + ] + }, + "translations": { + "description": "Build translation files", + "dependencies": [ + { + "name": "gettext", + "features": [ + "tools" + ] + } + ] + }, + "tests": { + "description": "Build tests", + "dependencies": [ + "gtest", + "benchmark" + ] + } + } }