Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .teamcity/Windows/Project.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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)
Expand Down
20 changes: 10 additions & 10 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand All @@ -70,35 +70,35 @@
"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"
}
},
{
"name": "x64-windows-release",
"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"
}
},
{
"name": "x64-windows-debug",
"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"
}
},
{
"name": "x64-windows-trinitydev",
"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"
}
},
{
Expand Down Expand Up @@ -174,4 +174,4 @@
}
}
]
}
}
2 changes: 1 addition & 1 deletion Ime.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
}
Expand Down
2 changes: 1 addition & 1 deletion Ime.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
1 change: 1 addition & 0 deletions StdAfx.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@

#pragma once

#include <string>
#include <BlueExposure.h>
6 changes: 1 addition & 5 deletions vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/carbonengine/vcpkg-registry
Submodule vcpkg-registry updated 207 files
Loading