Skip to content

Commit 0a84a16

Browse files
Update Windows builds to Windows 2025 and Visual Studio 2026
1 parent f5c67c3 commit 0a84a16

7 files changed

Lines changed: 21 additions & 21 deletions

File tree

.github/workflows/build-emscripten.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
build:
77
strategy:
88
matrix:
9-
os: ["windows-latest", "ubuntu-24.04", "macos-26"]
9+
os: ["windows-2025", "ubuntu-24.04", "macos-26"]
1010
build_type: ["Debug", "Release"]
1111

1212
exclude:
@@ -15,13 +15,13 @@ jobs:
1515
build_type: "Release"
1616

1717
include:
18-
- os: "windows-latest"
18+
- os: "windows-2025"
1919
build_type: "Release"
2020
host_name: "Win10"
2121
# Do not build WebGPU on Windows/Release as it is extremely slow
2222
cmake_args: "-DDILIGENT_EMSCRIPTEN_STRIP_DEBUG_INFO=ON -DDILIGENT_NO_WEBGPU=ON"
2323

24-
- os: "windows-latest"
24+
- os: "windows-2025"
2525
build_type: "Debug"
2626
host_name: "Win10"
2727
cmake_args: "-DDILIGENT_EMSCRIPTEN_STRIP_DEBUG_INFO=ON"

.github/workflows/build-windows.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push, pull_request]
44

55
jobs:
66
precheks:
7-
runs-on: windows-latest
7+
runs-on: windows-2025
88
name: Win10 -> Pre-checks
99

1010
steps:
@@ -36,15 +36,15 @@ jobs:
3636

3737
build:
3838
needs: precheks
39-
runs-on: windows-2022
39+
runs-on: windows-2025
4040

4141
strategy:
4242
fail-fast: false
4343
matrix:
4444
name: ["Win10"]
4545
toolset: ["Win32", "x64"]
4646
build_type: ["Debug", "Release"]
47-
cmake_generator: ["Visual Studio 17 2022"]
47+
cmake_generator: ["Visual Studio 18 2026"]
4848
cmake_args: ["-DDILIGENT_BUILD_TESTS=ON -DDILIGENT_NO_WEBGPU=OFF"]
4949
platform: ["Win32"]
5050
build_args: ["-- -restore"]
@@ -54,7 +54,7 @@ jobs:
5454
platform: "Win32"
5555
toolset: "x64"
5656
build_type: "RelWithDebInfo"
57-
cmake_generator: "Visual Studio 17 2022"
57+
cmake_generator: "Visual Studio 18 2026"
5858
cmake_args: "-DDILIGENT_BUILD_CORE_TESTS=ON -DDILIGENT_BUILD_TOOLS_TESTS=ON -DDILIGENT_DEVELOPMENT=ON"
5959
build_args: "-- -restore"
6060

@@ -76,14 +76,14 @@ jobs:
7676
platform: "UWP"
7777
toolset: "x64"
7878
build_type: "Debug"
79-
cmake_generator: "Visual Studio 17 2022"
79+
cmake_generator: "Visual Studio 18 2026"
8080
cmake_args: "-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0"
8181

8282
- name: "UWP"
8383
platform: "UWP"
8484
toolset: "x64"
8585
build_type: "Release"
86-
cmake_generator: "Visual Studio 17 2022"
86+
cmake_generator: "Visual Studio 18 2026"
8787
cmake_args: "-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0"
8888

8989
name: Win10 -> ${{ matrix.name }}-${{ matrix.toolset }}, ${{ matrix.build_type }}

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -185,17 +185,17 @@ Build prerequisites:
185185
.NET support requires .NET SDK 6.0 or later.
186186

187187
Use either CMake GUI or command line tool to generate build files. For example, to generate
188-
[Visual Studio 2022](https://visualstudio.microsoft.com/) 64-bit solution and project files in *build/Win64* folder,
188+
[Visual Studio 2026](https://visualstudio.microsoft.com/) 64-bit solution and project files in *build/Win64* folder,
189189
navigate to the engine's root folder and run the following command:
190190

191191
```
192-
cmake -S . -B ./build/Win64 -G "Visual Studio 17 2022" -A x64
192+
cmake -S . -B ./build/Win64 -G "Visual Studio 18 2026" -A x64
193193
```
194194

195195
You can generate Win32 solution that targets Win8.1 SDK using the following command:
196196

197197
```
198-
cmake -D CMAKE_SYSTEM_VERSION=8.1 -S . -B ./build/Win64_8.1 -G "Visual Studio 17 2022" -A x64
198+
cmake -D CMAKE_SYSTEM_VERSION=8.1 -S . -B ./build/Win64_8.1 -G "Visual Studio 18 2026" -A x64
199199
```
200200

201201
If you use MinGW, you can generate the make files using the command below (note however that the functionality
@@ -227,11 +227,11 @@ To generate build files for Universal Windows platform, you need to define the f
227227
* `CMAKE_SYSTEM_NAME=WindowsStore`
228228
* `CMAKE_SYSTEM_VERSION=< Windows Version >`
229229

230-
For example, to generate Visual Studio 2022 64-bit solution and project files in *build/UWP64* folder, run the following command
230+
For example, to generate Visual Studio 2026 64-bit solution and project files in *build/UWP64* folder, run the following command
231231
from the engine's root folder:
232232

233233
```
234-
cmake -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 -S . -B ./build/UWP64 -G "Visual Studio 17 2022" -A x64
234+
cmake -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 -S . -B ./build/UWP64 -G "Visual Studio 18 2026" -A x64
235235
```
236236

237237
Set the desired project as startup project (by default, GLTF Viewer will be selected) and run it.
@@ -669,7 +669,7 @@ Note that it defaults to `/usr/local` on UNIX and `c:/Program Files/${PROJECT_NA
669669
be what you want. Use `-D CMAKE_INSTALL_PREFIX=install` to use local `install` folder instead:
670670

671671
```
672-
cmake -S . -B ./build/Win64 -D CMAKE_INSTALL_PREFIX=install -G "Visual Studio 17 2022" -A x64
672+
cmake -S . -B ./build/Win64 -D CMAKE_INSTALL_PREFIX=install -G "Visual Studio 18 2026" -A x64
673673
```
674674

675675
To install libraries and header files, run the following CMake command from the build folder:
@@ -755,7 +755,7 @@ for the Web. To enable it on other platforms, use `DILIGENT_NO_WEBGPU=OFF`.
755755
The options can be set through cmake UI or from the command line as in the example below:
756756

757757
```
758-
cmake -D DILIGENT_NO_DIRECT3D11=TRUE -S . -B ./build/Win64 -G "Visual Studio 17 2022" -A x64
758+
cmake -D DILIGENT_NO_DIRECT3D11=TRUE -S . -B ./build/Win64 -G "Visual Studio 18 2026" -A x64
759759
```
760760

761761
Additionally, individual engine components can be enabled or disabled using the following options:
@@ -800,7 +800,7 @@ The path to the configuration script should be provided through `BUILD_CONFIGURA
800800
cmake and must be relative to the cmake root folder, for example:
801801

802802
```
803-
cmake -D BUILD_CONFIGURATION_FILE=BuildConfig.cmake -S . -B ./build/Win64 -G "Visual Studio 17 2022" -A x64
803+
cmake -D BUILD_CONFIGURATION_FILE=BuildConfig.cmake -S . -B ./build/Win64 -G "Visual Studio 18 2026" -A x64
804804
```
805805

806806
### Customizing global build settings with custom_configure_build() function

0 commit comments

Comments
 (0)