Skip to content

Commit

Permalink
Merge pull request #657 from stephengtuggy/fix/boost-1.78-0.8.x
Browse files Browse the repository at this point in the history
vcpkg.json, Windows-CI.yml: Port fix for Boost 1.78 issue on Windows …
  • Loading branch information
stephengtuggy authored Mar 21, 2022
2 parents 64a609f + f6f62a6 commit 1a1ede6
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 26 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/Windows-CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,19 @@ jobs:

- name: install-vcpkg
# You may pin to the exact commit or the version.
# uses: lukka/run-vcpkg@9c0ae56bad291f4b185cc433a9b56084b2962259
uses: lukka/run-vcpkg@v7
with:
vcpkgDirectory: '${{ github.workspace }}/v'
setupOnly: true
vcpkgGitCommitId: 'b3cfaaf1bba70febd07c2f672ae590dc5d914180'
vcpkgGitCommitId: '49a30e9db17a8edf7c2809940ee2036746b1b982'
vcpkgTriplet: 'x64-windows'
appendedCacheKey: ${{ hashFiles( '**/vcpkg.json' ) }}
additionalCachedPaths: ${{ env.buildDir }}/vcpkg_installed

- name: run-cmake
# You may pin to the exact commit or the version.
# uses: lukka/run-cmake@7ba4481660f0f04c86cfa5f1f24b90effc97bde1
uses: lukka/run-cmake@v3
with:
# Path to CMakeLists.txt. Used for both CMakeListsTxtBasic and CMakeListsTxtAdvanced modes.
Expand Down
52 changes: 27 additions & 25 deletions engine/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
{
"name": "vega-strike",
"version-string": "0.8.0",
"dependencies": [
"boost-python",
"boost-log",
"boost-date-time",
"boost-iostreams",
"boost-system",
"boost-filesystem",
"boost-thread",
"boost-chrono",
"boost-atomic",
"boost-assign",
"expat",
"freeglut",
"libpng",
"libjpeg-turbo",
"libvorbis",
"openal-soft",
"opengl",
"opengl-registry",
"sdl1",
"zlib"
]
}
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
"name": "vega-strike",
"version-string": "0.8.0",
"builtin-baseline": "1085a57da0725c19e19586025438e8c16f34c890",
"dependencies": [
"boost-python",
"boost-log",
"boost-date-time",
"boost-iostreams",
"boost-system",
"boost-filesystem",
"boost-thread",
"boost-chrono",
"boost-atomic",
"boost-assign",
"expat",
"freeglut",
"libpng",
"libjpeg-turbo",
"libvorbis",
"openal-soft",
"opengl",
"opengl-registry",
"sdl1",
"zlib"
]
}

0 comments on commit 1a1ede6

Please sign in to comment.