Fix windows build failure (#1595)

* Added version override for libiconv

* Updated vcpkg baseline, forced PhysFS version 3.0.2

* Updated vcpkg git commit
dev
Tomasz Kapuściński 2023-06-28 23:52:01 +02:00
parent 9c8a8f4cf4
commit a04dcd8014
2 changed files with 9 additions and 2 deletions

View File

@ -144,7 +144,7 @@ jobs:
uses: lukka/run-vcpkg@v7 uses: lukka/run-vcpkg@v7
with: with:
setupOnly: true setupOnly: true
vcpkgGitCommitId: '69efe9cc2df0015f0bb2d37d55acde4a75c9a25b' vcpkgGitCommitId: 'f6a5d4e8eb7476b8d7fc12a56dff300c1c986131'
vcpkgTriplet: ${{ matrix.vcpkg_triplet }} vcpkgTriplet: ${{ matrix.vcpkg_triplet }}
# SHA-256 hash of the vcpkg.json file, recalculated automatically when it changes # SHA-256 hash of the vcpkg.json file, recalculated automatically when it changes
appendedCacheKey: ${{ hashFiles( '**/vcpkg.json' ) }} appendedCacheKey: ${{ hashFiles( '**/vcpkg.json' ) }}

View File

@ -1,7 +1,7 @@
{ {
"name": "colobot", "name": "colobot",
"version-string": "0.1.0", "version-string": "0.1.0",
"builtin-baseline": "e809a42f87565e803b2178a0c11263f462d1800a", "builtin-baseline": "f6a5d4e8eb7476b8d7fc12a56dff300c1c986131",
"dependencies": [ "dependencies": [
"boost-algorithm", "boost-algorithm",
"boost-bimap", "boost-bimap",
@ -19,6 +19,7 @@
"glew", "glew",
"glm", "glm",
"gettext", "gettext",
"libiconv",
"libogg", "libogg",
"libpng", "libpng",
{ {
@ -44,6 +45,12 @@
"overrides": [ "overrides": [
{ {
"name": "zlib", "version": "1.2.13" "name": "zlib", "version": "1.2.13"
},
{
"name": "libiconv", "version": "1.17"
},
{
"name": "physfs", "version": "3.0.2"
} }
] ]
} }