From 494404fa9e3f2eb55ef90e7f4f1e33862faaa7bf Mon Sep 17 00:00:00 2001 From: Ccp Toebeans Date: Thu, 19 Mar 2026 09:41:43 +0000 Subject: [PATCH 1/2] Compile with v145 of the MSVC toolchain by default --- .teamcity/Windows/Project.kt | 2 +- CMakePresets.json | 20 +++++++++---------- vcpkg.json | 2 +- vendor/github.com/carbonengine/vcpkg-registry | 2 +- vendor/github.com/microsoft/vcpkg | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.teamcity/Windows/Project.kt b/.teamcity/Windows/Project.kt index 7683f0a..ed42a01 100644 --- a/.teamcity/Windows/Project.kt +++ b/.teamcity/Windows/Project.kt @@ -89,7 +89,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 "%%ProgramFiles(x86)%%\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\vsdevcmd.bat" -arch=x64 + call "%%ProgramFiles(x86)%%\Microsoft Visual Studio\18\BuildTools\Common7\Tools\vsdevcmd.bat" -arch=x64 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 9e1818f..bd81cff 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -15,7 +15,7 @@ "VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/triplets" }, "environment": { - "VCPKG_ROOT": "${sourceDir}/vendor/github.com/microsoft/vcpkg" + "PATH_TO_VCPKG_ROOT": "${sourceDir}/vendor/github.com/microsoft/vcpkg" }, "hidden": true }, @@ -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/vcpkg.json b/vcpkg.json index 958ad0c..5cd0a68 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -15,7 +15,7 @@ }, { "name": "python3", - "version>=": "3.12.9#1" + "version>=": "3.12.9#4" }, { "name": "carbon-core", diff --git a/vendor/github.com/carbonengine/vcpkg-registry b/vendor/github.com/carbonengine/vcpkg-registry index de86dca..74f3e7e 160000 --- a/vendor/github.com/carbonengine/vcpkg-registry +++ b/vendor/github.com/carbonengine/vcpkg-registry @@ -1 +1 @@ -Subproject commit de86dcad60458ef170911adb5c42a053fc5d9117 +Subproject commit 74f3e7ef37ca5006e4a17aa9ebdba8b7411c3149 diff --git a/vendor/github.com/microsoft/vcpkg b/vendor/github.com/microsoft/vcpkg index 460551b..4ef2a71 160000 --- a/vendor/github.com/microsoft/vcpkg +++ b/vendor/github.com/microsoft/vcpkg @@ -1 +1 @@ -Subproject commit 460551b0ec06be1ba6b918448bf3b0f44add813d +Subproject commit 4ef2a7144d00c2f446029b9700e701a3094b8bfb From db67733d2b0b68384e64d7433c155e1412e62c24 Mon Sep 17 00:00:00 2001 From: ccptoebeans <> Date: Wed, 25 Mar 2026 11:49:56 +0000 Subject: [PATCH 2/2] Get path to vsdev.bat file from agent param --- .teamcity/Windows/Project.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.teamcity/Windows/Project.kt b/.teamcity/Windows/Project.kt index ed42a01..8cfca22 100644 --- a/.teamcity/Windows/Project.kt +++ b/.teamcity/Windows/Project.kt @@ -89,7 +89,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 "%%ProgramFiles(x86)%%\Microsoft Visual Studio\18\BuildTools\Common7\Tools\vsdevcmd.bat" -arch=x64 + call "%env.VSDEV_BAT_PATH%" -arch=x64 echo ##teamcity[setParameter name='env.INCLUDE' value='%%INCLUDE%%'] echo ##teamcity[setParameter name='env.LIB' value='%%LIB%%'] echo ##teamcity[setParameter name='env.LIBPATH' value='%%LIBPATH%%']