From 8f142593eaf956b71ccaf958b3f6ec329ae54b10 Mon Sep 17 00:00:00 2001 From: Filipp Pavlov Date: Mon, 24 Aug 2026 13:44:12 +0000 Subject: [PATCH 1/3] Fix compile errors when building with v145 --- Ime.cpp | 2 +- Ime.h | 2 +- StdAfx.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Ime.cpp b/Ime.cpp index 022894f..3e61ae3 100644 --- a/Ime.cpp +++ b/Ime.cpp @@ -53,7 +53,7 @@ void Ime::AssociateContext( bool show ) ImeWrapper::ImmAssociateContext( m_window, show ? m_imc : nullptr ); } -long Ime::GetCursorPos() +int32_t Ime::GetCursorPos() { return ImeWrapper::ImmGetCompositionStringW( m_imc, GCS_CURSORPOS, nullptr, 0 ); } diff --git a/Ime.h b/Ime.h index 3a487a7..8ae130b 100644 --- a/Ime.h +++ b/Ime.h @@ -21,7 +21,7 @@ BLUE_CLASS( Ime ) : public IRoot void SetHWND( uintptr_t handle ); void AssociateContext( bool show ); - long GetCursorPos(); + int32_t GetCursorPos(); std::wstring GetCompositionString( DWORD mask ); size_t GetKeyboardLayout(); bool NotifyIME( DWORD dwAction, DWORD dwIndex, DWORD dwValue ); diff --git a/StdAfx.h b/StdAfx.h index 2f8182e..2d9ac06 100644 --- a/StdAfx.h +++ b/StdAfx.h @@ -2,4 +2,5 @@ #pragma once +#include #include From 349093778048cc30268798512a136084647ecc9a Mon Sep 17 00:00:00 2001 From: Filipp Pavlov Date: Mon, 24 Aug 2026 14:44:00 +0000 Subject: [PATCH 2/3] Switch to using v145 as the default compiler for Windows --- .teamcity/Windows/Project.kt | 4 ++-- CMakePresets.json | 20 +++++++++---------- vendor/github.com/carbonengine/vcpkg-registry | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.teamcity/Windows/Project.kt b/.teamcity/Windows/Project.kt index e82c8ef..ff3b05e 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 @@ -50,7 +50,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) 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", "-arch=x64 -vcvars_ver=14.1") + 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) diff --git a/CMakePresets.json b/CMakePresets.json index c848838..b63a433 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" } }, { @@ -174,4 +174,4 @@ } } ] -} +} \ No newline at end of file diff --git a/vendor/github.com/carbonengine/vcpkg-registry b/vendor/github.com/carbonengine/vcpkg-registry index d7d4b17..9e6fcd1 160000 --- a/vendor/github.com/carbonengine/vcpkg-registry +++ b/vendor/github.com/carbonengine/vcpkg-registry @@ -1 +1 @@ -Subproject commit d7d4b1700f90b2edcc9f1e296f5cdb892f834008 +Subproject commit 9e6fcd1d95a468715e67e3b59fe3ed33658437de From 1d353bab9838d6393006170556dcb91f325a9607 Mon Sep 17 00:00:00 2001 From: filipppavlov Date: Fri, 11 Sep 2026 15:42:06 +0000 Subject: [PATCH 3/3] Update blue version --- vcpkg.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/vcpkg.json b/vcpkg.json index 74995de..d85ab50 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -2,14 +2,10 @@ "dependencies": [ { "name": "carbon-blue", - "version>=": "6.0.0" + "version>=": "6.2.0" } ], "overrides": [ - { - "name": "protobuf", - "version": "3.6.0.1" - }, { "name": "openssl", "version": "1.1.1k#8"