Merge pull request #1575 from colobot/1571-optimize-windows-builds-with-vcpkg
Optimize Windows builds with vcpkgfix-squashed-planets
commit
06bf44da38
|
@ -134,11 +134,12 @@ jobs:
|
||||||
- name: Install Colobot dependencies
|
- name: Install Colobot dependencies
|
||||||
uses: lukka/run-vcpkg@v7
|
uses: lukka/run-vcpkg@v7
|
||||||
with:
|
with:
|
||||||
|
setupOnly: true
|
||||||
vcpkgGitCommitId: '69efe9cc2df0015f0bb2d37d55acde4a75c9a25b'
|
vcpkgGitCommitId: '69efe9cc2df0015f0bb2d37d55acde4a75c9a25b'
|
||||||
vcpkgTriplet: ${{ matrix.vcpkg_triplet }}
|
vcpkgTriplet: ${{ matrix.vcpkg_triplet }}
|
||||||
setupOnly: true
|
# SHA-256 hash of the vcpkg.json file, recalculated automatically when it changes
|
||||||
# SHA-256 hash of the list of packages above, for caching purposes
|
appendedCacheKey: ${{ hashFiles( '**/vcpkg.json' ) }}
|
||||||
appendedCacheKey: '56a81d2ed18a506e5ce5cf4dc4e6ed9874bba3905ed5e9b073ea717a0663db0a'
|
additionalCachedPaths: ${{ github.workspace }}/build/vcpkg_installed
|
||||||
- name: Install external tools
|
- name: Install external tools
|
||||||
working-directory: ${{ github.workspace }}
|
working-directory: ${{ github.workspace }}
|
||||||
run: |
|
run: |
|
||||||
|
|
|
@ -48,3 +48,6 @@ CMakeLists.txt.user.*
|
||||||
/CMakeSettings.json
|
/CMakeSettings.json
|
||||||
/.vs
|
/.vs
|
||||||
/out
|
/out
|
||||||
|
|
||||||
|
# Ignore CMakeUserPresets.json
|
||||||
|
CMakeUserPresets.json
|
||||||
|
|
46
vcpkg.json
46
vcpkg.json
|
@ -3,15 +3,32 @@
|
||||||
"version-string": "0.1.0",
|
"version-string": "0.1.0",
|
||||||
"builtin-baseline": "e809a42f87565e803b2178a0c11263f462d1800a",
|
"builtin-baseline": "e809a42f87565e803b2178a0c11263f462d1800a",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
"boost-system",
|
|
||||||
"boost-filesystem",
|
|
||||||
"boost-regex",
|
|
||||||
"boost-lexical-cast",
|
|
||||||
"boost-bimap",
|
|
||||||
"boost-algorithm",
|
"boost-algorithm",
|
||||||
"boost-property-tree",
|
"boost-bimap",
|
||||||
|
"boost-filesystem",
|
||||||
|
"boost-lexical-cast",
|
||||||
"boost-optional",
|
"boost-optional",
|
||||||
|
"boost-property-tree",
|
||||||
"boost-range",
|
"boost-range",
|
||||||
|
"boost-regex",
|
||||||
|
"boost-system",
|
||||||
|
{
|
||||||
|
"name": "freetype",
|
||||||
|
"default-features": false
|
||||||
|
},
|
||||||
|
"glew",
|
||||||
|
"gettext",
|
||||||
|
"libogg",
|
||||||
|
"libpng",
|
||||||
|
{
|
||||||
|
"name": "libsndfile",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [ "external-libs" ]
|
||||||
|
},
|
||||||
|
"libvorbis",
|
||||||
|
"openal-soft",
|
||||||
|
"opus",
|
||||||
|
"physfs",
|
||||||
"sdl2",
|
"sdl2",
|
||||||
{
|
{
|
||||||
"name": "sdl2-image",
|
"name": "sdl2-image",
|
||||||
|
@ -21,23 +38,6 @@
|
||||||
"name": "sdl2-ttf",
|
"name": "sdl2-ttf",
|
||||||
"default-features": false
|
"default-features": false
|
||||||
},
|
},
|
||||||
"glew",
|
|
||||||
"libpng",
|
|
||||||
"gettext",
|
|
||||||
{
|
|
||||||
"name": "libsndfile",
|
|
||||||
"default-features": false,
|
|
||||||
"features": [ "external-libs" ]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "freetype",
|
|
||||||
"default-features": false
|
|
||||||
},
|
|
||||||
"libvorbis",
|
|
||||||
"libogg",
|
|
||||||
"opus",
|
|
||||||
"openal-soft",
|
|
||||||
"physfs",
|
|
||||||
"zlib"
|
"zlib"
|
||||||
],
|
],
|
||||||
"overrides": [
|
"overrides": [
|
||||||
|
|
Loading…
Reference in New Issue