Skip to content

Commit

Permalink
Merge pull request #79121 from moxian/vcpkg-version
Browse files Browse the repository at this point in the history
Add versioning to vcpkg setup
  • Loading branch information
GuardianDll authored Jan 13, 2025
2 parents a1be5ae + 301ffe3 commit d807c24
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
6 changes: 4 additions & 2 deletions doc/COMPILING/COMPILING-VS-VCPKG.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ In a `cmd.exe` shell:
REM cd to the appropriate folder first
git clone https://github.com/Microsoft/vcpkg.git
cd vcpkg
git checkout 3b57fb2e1ff55613db14d2aaf0a30529289c7050
git pull
.\bootstrap-vcpkg.bat -disableMetrics
.\vcpkg integrate install
```
Expand All @@ -40,11 +40,13 @@ In a Git Bash shell, the commands are almost the same except the filesystem path
# cd to the appropriate folder first
git clone https://github.com/Microsoft/vcpkg.git
cd vcpkg
git checkout 3b57fb2e1ff55613db14d2aaf0a30529289c7050
git pull
./bootstrap-vcpkg.bat -disableMetrics
./vcpkg.exe integrate install
```

If during the compilation you're getting a vcpkg error along the lines of `error: no version database entry for sdl2 at 2.26.5`, that probably means that your vcpkg install is too old. Running a `git pull` in vcpkg directory should fix the issue.

## Cloning and compilation:

1. Clone Cataclysm-DDA repository with following command line:
Expand Down
13 changes: 10 additions & 3 deletions msvc-full-features/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
"name": "cdda-vcpkg-dependencies",
"version-string": "0.I",
"dependencies": [
"sdl2",
{
"name": "sdl2",
"version>=": "2.26.4#0"
},
{
"name": "sdl2-image",
"features": [ "libjpeg-turbo" ]
Expand All @@ -12,6 +15,10 @@
"features": [ "libflac", "mpg123", "libmodplug" ]
},
"sdl2-ttf",
"pdcurses"
]
{
"name": "pdcurses",
"version>=": "3.9#4"
}
],
"builtin-baseline": "5b11232d00476c66724c81adfe5e3777a9aec38f"
}

0 comments on commit d807c24

Please sign in to comment.