From 9677f8f3e3911e32dc00fe87052a43efe319fb1c Mon Sep 17 00:00:00 2001 From: Filipp Pavlov Date: Wed, 19 Aug 2026 15:31:20 +0000 Subject: [PATCH 1/2] Switch to using v145 as the default compiler for Windows --- .teamcity/Windows/Project.kt | 4 ++-- CMakePresets.json | 18 +++++++++--------- vendor/github.com/carbonengine/vcpkg-registry | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.teamcity/Windows/Project.kt b/.teamcity/Windows/Project.kt index 70d68e5..fa7763c 100644 --- a/.teamcity/Windows/Project.kt +++ b/.teamcity/Windows/Project.kt @@ -38,7 +38,7 @@ object Project : Project({ }) -class CarbonBuildWindows(buildName: String, configType: String, preset: String) : BuildType({ +class CarbonBuildWindows(buildName: String, configType: String, preset: String, vsDevBatSwitches: String = "-arch=x64 -vcvars_ver=14.51") : BuildType({ id(buildName.toId()) this.name = buildName @@ -91,7 +91,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) scriptContent = """ REM unfortunately ninja does not find the VS environment otherwise REM NB: the exported PATH also contains the location where we installed sentry-cli, e.g. teamcity.agent.work.dir - call "%env.VSDEV_BAT_PATH%" -arch=x64 + call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% echo ##teamcity[setParameter name='env.INCLUDE' value='%%INCLUDE%%'] echo ##teamcity[setParameter name='env.LIB' value='%%LIB%%'] echo ##teamcity[setParameter name='env.LIBPATH' value='%%LIBPATH%%'] diff --git a/CMakePresets.json b/CMakePresets.json index c848838..bd81cff 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -43,7 +43,7 @@ "name": "x64-windows", "inherits": "windows", "cacheVariables": { - "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" + "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-145-carbon.cmake" }, "hidden": true }, @@ -70,8 +70,8 @@ "inherits": "x64-windows", "cacheVariables": { "CMAKE_BUILD_TYPE": "Internal", - "VCPKG_TARGET_TRIPLET": "x64-windows-internal", - "VCPKG_HOST_TRIPLET": "x64-windows-internal" + "VCPKG_TARGET_TRIPLET": "x64-windows-145-internal", + "VCPKG_HOST_TRIPLET": "x64-windows-145-internal" } }, { @@ -79,8 +79,8 @@ "inherits": "x64-windows", "cacheVariables": { "CMAKE_BUILD_TYPE": "Release", - "VCPKG_TARGET_TRIPLET": "x64-windows-release", - "VCPKG_HOST_TRIPLET": "x64-windows-release" + "VCPKG_TARGET_TRIPLET": "x64-windows-145-release", + "VCPKG_HOST_TRIPLET": "x64-windows-145-release" } }, { @@ -88,8 +88,8 @@ "inherits": "x64-windows", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", - "VCPKG_TARGET_TRIPLET": "x64-windows-debug", - "VCPKG_HOST_TRIPLET": "x64-windows-debug" + "VCPKG_TARGET_TRIPLET": "x64-windows-145-debug", + "VCPKG_HOST_TRIPLET": "x64-windows-145-debug" } }, { @@ -97,8 +97,8 @@ "inherits": "x64-windows", "cacheVariables": { "CMAKE_BUILD_TYPE": "TrinityDev", - "VCPKG_TARGET_TRIPLET": "x64-windows-trinitydev", - "VCPKG_HOST_TRIPLET": "x64-windows-trinitydev" + "VCPKG_TARGET_TRIPLET": "x64-windows-145-trinitydev", + "VCPKG_HOST_TRIPLET": "x64-windows-145-trinitydev" } }, { diff --git a/vendor/github.com/carbonengine/vcpkg-registry b/vendor/github.com/carbonengine/vcpkg-registry index ba01535..9e6fcd1 160000 --- a/vendor/github.com/carbonengine/vcpkg-registry +++ b/vendor/github.com/carbonengine/vcpkg-registry @@ -1 +1 @@ -Subproject commit ba01535375d12c8650ae5a21dff960b809dad190 +Subproject commit 9e6fcd1d95a468715e67e3b59fe3ed33658437de From a0795c867ead76bd5f76740ab1b47339194876e6 Mon Sep 17 00:00:00 2001 From: Filipp Pavlov Date: Wed, 19 Aug 2026 15:52:05 +0000 Subject: [PATCH 2/2] Set the correct environment variable --- .teamcity/Windows/Project.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.teamcity/Windows/Project.kt b/.teamcity/Windows/Project.kt index fa7763c..d6639e7 100644 --- a/.teamcity/Windows/Project.kt +++ b/.teamcity/Windows/Project.kt @@ -48,8 +48,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, param("env.GIT_TAG_HASH_OVERRIDE", "") param("github_checkout_folder", "github") param("env.CTEST_JUNIT_OUTPUT_FILE", "ctest_results.xml") - select("env.VISUAL_STUDIO_PLATFORM_TOOLSET", "v141", label = "Visual Studio Platform Toolset", description = "Specify the toolset for the build. e.g. v141 or v143.", - options = listOf("v141 (2017)" to "v141", "v143 (2022)" to "v143")) + param("VS_DEV_BAT_SWITCHES", vsDevBatSwitches) param("env.CMAKE_BUILD_TARGETS", "all") param("env.CMAKE_INSTALL_PREFIX", ".build-artifact") param("env.CMAKE_CONFIG_TYPE", configType)