Skip to content

Switch to using v145 as the default compiler for Windows #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
filipppavlov wants to merge 2 commits into
base: main
Choose a base branch
from
+19 −21
Draft

Switch to using v145 as the default compiler for Windows #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
901d1ad
Fix compile warnings/errors when building with v145
filipppavlov Aug 19, 2026
12175d1
Switch to using v145 as the default compiler for Windows
filipppavlov Aug 25, 2026
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
6 changes: 2 additions & 4 deletions .teamcity/Windows/Project.kt
View file
Open in desktop
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 @@ -48,9 +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", "-arch=x64")
param("VS_DEV_BAT_SWITCHES", vsDevBatSwitches)
param("env.VSDEV_BAT_PATH", "%%ProgramFiles(x86)%%/Microsoft Visual Studio/2017/BuildTools/Common7/Tools/vsdevcmd.bat")
param("env.CMAKE_BUILD_TARGETS", "all")
param("env.CMAKE_INSTALL_PREFIX", ".build-artifact")
Expand Down
18 changes: 9 additions & 9 deletions CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,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 @@ -71,35 +71,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
2 changes: 1 addition & 1 deletion trinity/Eve/SpaceObject/Children/EveChildCloud2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ void EveChildCloud2::PopulatePerObjectData( PerObjectData& data, float screenSiz
if( radius > 0 )
{
data.lights[i].innerRadius = std::max( std::min( light->GetLightData().innerRadius / radius, 1.f ), 0.f );
data.lights[i].color = ( Vector4( color ) * light->GetBrightnessMultiplier() ).GetXYZ() * pow( data.lights[i].innerRadius * 2 + 1, 3 );
data.lights[i].color = ( Vector4( color ) * light->GetBrightnessMultiplier() ).GetXYZ() * pow( data.lights[i].innerRadius * 2 + 1, 3.f );
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion trinity/Eve/SpaceObject/EveMissileWarhead.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ void EveMissileWarhead::UpdateWarhead( float deltaT, float estimatedTotalAliveTi
// override some behaviour for bombs
if( m_bombFlightpath )
{
const float bombTrackBall = pow( 1.f - quickFlight01, 2 );
const float bombTrackBall = pow( 1.f - quickFlight01, 2.f );
m_currentOffset *= bombTrackBall;
}

Expand Down
2 changes: 1 addition & 1 deletion trinity/Tr2DepthStencil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ void Tr2DepthStencil::py__init__(
}
}

long Tr2DepthStencil::Create( unsigned width, unsigned height, DepthStencilFormat dsFormat, unsigned msaaType, unsigned msaaQuality, Tr2RenderContextEnum::ExFlag flags )
int32_t Tr2DepthStencil::Create( unsigned width, unsigned height, DepthStencilFormat dsFormat, unsigned msaaType, unsigned msaaQuality, Tr2RenderContextEnum::ExFlag flags )
{
USE_MAIN_THREAD_RENDER_CONTEXT();
auto gpuUsage = Tr2GpuUsage::DEPTH_STENCIL | Tr2GpuUsage::SHADER_RESOURCE;
Expand Down
2 changes: 1 addition & 1 deletion trinity/Tr2DepthStencil.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ BLUE_CLASS( Tr2DepthStencil ) :
Be::OptionalWithDefaultValue<unsigned, 0> msaaQuality,
Be::OptionalWithDefaultValue<Tr2RenderContextEnum::ExFlag, Tr2RenderContextEnum::EX_NONE> flags );

long Create(
int32_t Create(
unsigned width,
unsigned height,
Tr2RenderContextEnum::DepthStencilFormat format,
Expand Down
4 changes: 2 additions & 2 deletions trinity/Tr2RenderTarget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,14 +357,14 @@ bool Tr2RenderTarget::IsReadable() const
return GetRenderTarget().IsValid() && Tr2GpuUsage::HasFlag( GetRenderTarget().GetGpuUsage(), Tr2GpuUsage::SHADER_RESOURCE );
}

long Tr2RenderTarget::GenerateMipMaps()
int32_t Tr2RenderTarget::GenerateMipMaps()
{
CCP_STATS_ZONE( __FUNCTION__ );
USE_MAIN_THREAD_RENDER_CONTEXT();
return GetRenderTarget().GenerateMipMaps( renderContext ).GetResult();
}

long Tr2RenderTarget::Resolve( Tr2RenderTarget* destination )
int32_t Tr2RenderTarget::Resolve( Tr2RenderTarget* destination )
{
CCP_STATS_ZONE( __FUNCTION__ );
USE_MAIN_THREAD_RENDER_CONTEXT();
Expand Down
4 changes: 2 additions & 2 deletions trinity/Tr2RenderTarget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ BLUE_CLASS( Tr2RenderTarget ) :
Tr2RenderContextEnum::PixelFormat GetFormat() const;
Tr2RenderContextEnum::TextureType GetType() const;

long GenerateMipMaps();
long Resolve( Tr2RenderTarget * destination );
int32_t GenerateMipMaps();
int32_t Resolve( Tr2RenderTarget * destination );

Tr2TextureAL& GetRenderTarget();
const Tr2TextureAL& GetRenderTarget() const;
Expand Down