From f4466616e640429425e2d44ed86c8ace369beb0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pa=CC=84vels=20Nadtoc=CC=8Cajevs?=
 <7645683+bruvzg@users.noreply.github.com>
Date: Fri, 31 Oct 2025 21:29:10 +0200
Subject: [PATCH] Update CI images to windows-2022

---
 .github/workflows/ci.yaml | 16 ++++++++--------
 SConstruct                |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index cd70738..66734f6 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -14,7 +14,7 @@ jobs:
         # MinGW/LLVM libs using UCRT
         - name: 🏁 Windows - MinGW/LLVM (UCRT) x86_64
           platform: windows
-          os: windows-2019
+          os: windows-2022
           artifact-name: godot-nir-static-x86_64-llvm-release
           artifact-path: bin/libNIR.windows.x86_64.a
           flags: use_mingw=yes arch=x86_64 use_llvm=yes mingw_prefix=$HOME/llvm-mingw
@@ -22,7 +22,7 @@ jobs:
 
         - name: 🏁 Windows - MinGW/LLVM (UCRT) x86_32
           platform: windows
-          os: windows-2019
+          os: windows-2022
           artifact-name: godot-nir-static-x86_32-llvm-release
           artifact-path: bin/libNIR.windows.x86_32.a
           flags: use_mingw=yes arch=x86_32 use_llvm=yes mingw_prefix=$HOME/llvm-mingw
@@ -30,7 +30,7 @@ jobs:
 
         - name: 🏁 Windows - MinGW/LLVM (UCRT) arm64
           platform: windows
-          os: windows-2019
+          os: windows-2022
           artifact-name: godot-nir-static-arm64-llvm-release
           artifact-path: bin/libNIR.windows.arm64.a
           flags: use_mingw=yes arch=arm64 use_llvm=yes mingw_prefix=$HOME/llvm-mingw
@@ -39,21 +39,21 @@ jobs:
         # MSVC libs
         - name: 🏁 Windows - MSVC x86_64
           platform: windows
-          os: windows-2019
+          os: windows-2022
           artifact-name: godot-nir-static-x86_64-msvc-release
           artifact-path: bin/libNIR.windows.x86_64.lib
           flags: use_mingw=no arch=x86_64
 
         - name: 🏁 Windows - MSVC x86_32
           platform: windows
-          os: windows-2019
+          os: windows-2022
           artifact-name: godot-nir-static-x86_32-msvc-release
           artifact-path: bin/libNIR.windows.x86_32.lib
           flags: use_mingw=no arch=x86_32
 
         - name: 🏁 Windows - MSVC arm64
           platform: windows
-          os: windows-2019
+          os: windows-2022
           artifact-name: godot-nir-static-arm64-msvc-release
           artifact-path: bin/libNIR.windows.arm64.lib
           flags: use_mingw=no arch=arm64
@@ -61,7 +61,7 @@ jobs:
         # MinGW/GCC libs using MSVCRT
         - name: 🏁 Windows - MinGW/GCC (MSVCRT) x86_64
           platform: windows
-          os: windows-2019
+          os: windows-2022
           artifact-name: godot-nir-static-x86_64-gcc-release
           artifact-path: bin/libNIR.windows.x86_64.a
           flags: use_mingw=yes arch=x86_64
@@ -71,7 +71,7 @@ jobs:
 
         - name: 🏁 Windows - MinGW/GCC (MSVCRT) x86_32
           platform: windows
-          os: windows-2019
+          os: windows-2022
           artifact-name: godot-nir-static-x86_32-gcc-release
           artifact-path: bin/libNIR.windows.x86_32.a
           flags: use_mingw=yes arch=x86_32
diff --git a/SConstruct b/SConstruct
index a731c83..34e3b76 100644
--- a/SConstruct
+++ b/SConstruct
@@ -322,7 +322,6 @@ if env.get("is_msvc", False):
 else:
     env.Append(
         CPPDEFINES=[
-            ("__MSVCRT_VERSION__", 0x0700),
             "HAVE_STRUCT_TIMESPEC",
         ]
     )
@@ -331,6 +330,7 @@ else:
 
 if env.get("use_llvm", False):
     extra_defines += [
+        ("__MSVCRT_VERSION__", 0x0700),
         "HAVE_TIMESPEC_GET",
         "_UCRT",
     ]