ref: 6341c149c4dd9bbbdb037bc5daab9b931378f23d
parent: 1cf7481bdb49685eeaf51d90902e4fd1ded44cb4
author: Tanguy Fautre <tanguy@fautre.com>
date: Wed Jul 27 08:07:29 EDT 2022
Update vcpkg to 2022.05.10. Target Visual Studio 2022.
--- a/.github/workflows/windows_x64.yml
+++ b/.github/workflows/windows_x64.yml
@@ -5,7 +5,7 @@
jobs:
build:
- runs-on: windows-latest
+ runs-on: windows-2022
steps:
- uses: actions/checkout@v2
- name: Compile vcpkg dependencies
--- a/.github/workflows/windows_x86.yml
+++ b/.github/workflows/windows_x86.yml
@@ -5,7 +5,7 @@
jobs:
build:
- runs-on: windows-latest
+ runs-on: windows-2022
steps:
- uses: actions/checkout@v2
- name: Compile vcpkg dependencies
--- a/README.md
+++ b/README.md
@@ -33,13 +33,13 @@
## Build
-**Windows (Visual Studio 2019 x86 solution)** [![Windows x86 CI Status](https://github.com/GPSnoopy/BelgianChocolateDuke3D/workflows/Windows%20x86%20CI/badge.svg)](https://github.com/GPSnoopy/BelgianChocolateDuke3D/actions?query=workflow%3A%22Windows+x86+CI%22)
+**Windows (Visual Studio 2022 x86 solution)** [![Windows x86 CI Status](https://github.com/GPSnoopy/BelgianChocolateDuke3D/workflows/Windows%20x86%20CI/badge.svg)](https://github.com/GPSnoopy/BelgianChocolateDuke3D/actions?query=workflow%3A%22Windows+x86+CI%22)
```
> vcpkg_windows_x86.bat
> build_windows_x86.bat
```
-**Windows (Visual Studio 2019 x64 solution)** [![Windows x64 CI Status](https://github.com/GPSnoopy/BelgianChocolateDuke3D/workflows/Windows%20x64%20CI/badge.svg)](https://github.com/GPSnoopy/BelgianChocolateDuke3D/actions?query=workflow%3A%22Windows+x64+CI%22)
+**Windows (Visual Studio 2022 x64 solution)** [![Windows x64 CI Status](https://github.com/GPSnoopy/BelgianChocolateDuke3D/workflows/Windows%20x64%20CI/badge.svg)](https://github.com/GPSnoopy/BelgianChocolateDuke3D/actions?query=workflow%3A%22Windows+x64+CI%22)
```
> vcpkg_windows_x64.bat
> build_windows_x64.bat
--- a/build_windows_x64.bat
+++ b/build_windows_x64.bat
@@ -1,7 +1,7 @@
cd build || goto :error
mkdir windows.x64 || goto :error
cd windows.x64 || goto :error
-cmake -D VCPKG_TARGET_TRIPLET=x64-windows-static -D CMAKE_TOOLCHAIN_FILE=../vcpkg.windows.x64/scripts/buildsystems/vcpkg.cmake -G "Visual Studio 16 2019" -A "x64" ../.. || goto :error
+cmake -D VCPKG_TARGET_TRIPLET=x64-windows-static -D CMAKE_TOOLCHAIN_FILE=../vcpkg.windows.x64/scripts/buildsystems/vcpkg.cmake -G "Visual Studio 17 2022" -A "x64" ../.. || goto :error
msbuild BelgianChocolateDuke3D.sln /t:Rebuild /p:Configuration=Release /p:Platform=x64 || goto :error
cd ..
cd ..
--- a/build_windows_x86.bat
+++ b/build_windows_x86.bat
@@ -1,7 +1,7 @@
cd build || goto :error
mkdir windows.x86 || goto :error
cd windows.x86 || goto :error
-cmake -D VCPKG_TARGET_TRIPLET=x86-windows-static -D CMAKE_TOOLCHAIN_FILE=../vcpkg.windows.x86/scripts/buildsystems/vcpkg.cmake -G "Visual Studio 16 2019" -A "Win32" ../.. || goto :error
+cmake -D VCPKG_TARGET_TRIPLET=x86-windows-static -D CMAKE_TOOLCHAIN_FILE=../vcpkg.windows.x86/scripts/buildsystems/vcpkg.cmake -G "Visual Studio 17 2022" -A "Win32" ../.. || goto :error
msbuild BelgianChocolateDuke3D.sln /t:Rebuild /p:Configuration=Release /p:Platform=Win32 || goto :error
cd ..
cd ..
--- a/vcpkg_macosx.sh
+++ b/vcpkg_macosx.sh
@@ -5,7 +5,7 @@
cd build
git clone https://github.com/Microsoft/vcpkg.git vcpkg.macosx
cd vcpkg.macosx
-git checkout 2020.04
+git checkout 2022.05.10
./bootstrap-vcpkg.sh
./vcpkg install \
--- a/vcpkg_windows_x64.bat
+++ b/vcpkg_windows_x64.bat
@@ -2,7 +2,7 @@
cd build || goto :error
git clone https://github.com/Microsoft/vcpkg.git vcpkg.windows.x64 || goto :error
cd vcpkg.windows.x64 || goto :error
-git checkout 2020.04 || goto :error
+git checkout 2022.05.10 || goto :error
call bootstrap-vcpkg.bat || goto :error
vcpkg.exe install ^
--- a/vcpkg_windows_x86.bat
+++ b/vcpkg_windows_x86.bat
@@ -2,7 +2,7 @@
cd build || goto :error
git clone https://github.com/Microsoft/vcpkg.git vcpkg.windows.x86 || goto :error
cd vcpkg.windows.x86 || goto :error
-git checkout 2020.04 || goto :error
+git checkout 2022.05.10 || goto :error
call bootstrap-vcpkg.bat || goto :error
vcpkg.exe install ^