From c35f679e74047fde94a4894aa40854947543c526 Mon Sep 17 00:00:00 2001 From: ccptoebeans Date: Mon, 27 Jul 2026 13:32:33 +0000 Subject: [PATCH 1/4] Make Destiny compile with MSVC v145 by default --- CMakePresets.json | 20 +++++++++---------- vcpkg.json | 8 ++------ vendor/github.com/carbonengine/vcpkg-registry | 2 +- vendor/github.com/microsoft/vcpkg | 2 +- 4 files changed, 14 insertions(+), 18 deletions(-) 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 66376c6..b3a34d2 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -6,11 +6,11 @@ }, { "name": "carbon-blue", - "version>=": "5.1.2" + "version>=": "6.1.0" }, { "name": "carbon-core", - "version>=": "2.6.0" + "version>=": "3.0.1" }, { "name": "carbon-math", @@ -23,10 +23,6 @@ } ], "overrides": [ - { - "name": "protobuf", - "version": "3.6.0.1" - }, { "name": "openssl", "version": "1.1.1k#8" diff --git a/vendor/github.com/carbonengine/vcpkg-registry b/vendor/github.com/carbonengine/vcpkg-registry index de86dca..2647de9 160000 --- a/vendor/github.com/carbonengine/vcpkg-registry +++ b/vendor/github.com/carbonengine/vcpkg-registry @@ -1 +1 @@ -Subproject commit de86dcad60458ef170911adb5c42a053fc5d9117 +Subproject commit 2647de96bab1a4134c8edb27a0868d2fa38ab51b diff --git a/vendor/github.com/microsoft/vcpkg b/vendor/github.com/microsoft/vcpkg index 7066011..6d9d7df 160000 --- a/vendor/github.com/microsoft/vcpkg +++ b/vendor/github.com/microsoft/vcpkg @@ -1 +1 @@ -Subproject commit 7066011e27c97dbcfff739be2b69b592a41fc74a +Subproject commit 6d9d7df564a1ccdaa994e4ad39ccd4a32360867b From 6ba63f7815936294382131cd7e57fa3cf0f93b6f Mon Sep 17 00:00:00 2001 From: ccptoebeans Date: Mon, 27 Jul 2026 14:00:22 +0000 Subject: [PATCH 2/4] Build with v14.51 on teamcity by default on windows agents --- .teamcity/Windows/Project.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.teamcity/Windows/Project.kt b/.teamcity/Windows/Project.kt index 56010cf..9472649 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 @@ -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) @@ -91,7 +90,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 "%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%%'] From 4a29c7e1c5b7451460639d1c081ed2f893ca1bdc Mon Sep 17 00:00:00 2001 From: ccptoebeans Date: Thu, 6 Aug 2026 14:50:26 +0000 Subject: [PATCH 3/4] Temporarily use vcpkg-registry from ccptoebeans fork --- vcpkg-configuration.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index 11f84ea..a838d0e 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -7,8 +7,9 @@ "registries": [ { "kind": "git", - "repository": "git@github.com:carbonengine/vcpkg-registry.git", - "baseline": "2027e0c9d34193f468438589c4e6bb25996e823d", + "repository": "git@github.com:ccptoebeans/vcpkg-registry.git", + "baseline": "573e665ef92874afc000187b7358f0ff83e0aea8", + "reference": "VCPKG_PLATFORM_TOOLSET_VERSION", "packages": ["python3", "carbon-*", "tracy", "greenlet", "ccp-debug-info", "crashpad", "zlib"] } ] From 8c624e5a828a96a716d38e95aa1f55c3c2cd3f89 Mon Sep 17 00:00:00 2001 From: ccptoebeans Date: Thu, 6 Aug 2026 15:12:39 +0000 Subject: [PATCH 4/4] update vcpkg-regsitry submodule to latest --- vendor/github.com/carbonengine/vcpkg-registry | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/github.com/carbonengine/vcpkg-registry b/vendor/github.com/carbonengine/vcpkg-registry index 2647de9..ec7d8d8 160000 --- a/vendor/github.com/carbonengine/vcpkg-registry +++ b/vendor/github.com/carbonengine/vcpkg-registry @@ -1 +1 @@ -Subproject commit 2647de96bab1a4134c8edb27a0868d2fa38ab51b +Subproject commit ec7d8d86e07879d1c73ba2016ac34dd6610fef6a