Skip to content
Open
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
7 changes: 3 additions & 4 deletions .teamcity/Windows/Project.kt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,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 @@ -46,8 +46,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")
Comment thread
filipppavlov marked this conversation as resolved.
param("env.CMAKE_INSTALL_PREFIX", ".build-artifact")
param("env.CMAKE_CONFIG_TYPE", configType)
Expand Down Expand Up @@ -89,7 +88,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%%']
Expand Down
18 changes: 9 additions & 9 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
1 change: 1 addition & 0 deletions src/processor/cmffile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "cmffile.h"
#include "cmf/compression.h"
#include "cmf/writer.h"
#include <stdexcept>

// NOLINTBEGIN(cppcoreguidelines-owning-memory)
std::vector<uint8_t> ReadFile( const char* path )
Expand Down
2 changes: 2 additions & 0 deletions src/viewer/data/cmfcontent.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
#pragma once

#include <cmf/cmf.h>
#include <memory>
#include <vector>


// Simple owner class for the cmf data
Expand Down
1 change: 1 addition & 0 deletions src/viewer/rendering/renderable/geometryprepass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "cmf/declutils.h"
#include "rendering/vulkan/vulkanerrors.h"
#include <numeric>
#include <stdexcept>

GeometryPrePass::GeometryPrePass( std::shared_ptr<const Renderer> renderer, std::shared_ptr<CmfContent> cmfContent, const cmf::Mesh& cmfMesh ) :
m_cmfMesh( cmfMesh ),
Expand Down
1 change: 1 addition & 0 deletions src/viewer/rendering/ui/uiCustomWidgets.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include <faLookup.h>
#include <vector>
#include <string>

#include "uiConsts.h"

Expand Down
2 changes: 2 additions & 0 deletions src/viewer/rendering/vulkan/shadercache.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

#include <cmf/declutils.h>

#include <iterator>

#include "vulkanerrors.h"
#include "vulkanenums.h"

Expand Down
1 change: 1 addition & 0 deletions src/viewer/rendering/vulkan/texture.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright © 2025 CCP ehf.

#include "texture.h"
#include <stdexcept>

Texture::Texture() :
m_image( VK_NULL_HANDLE ),
Expand Down
2 changes: 1 addition & 1 deletion vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
},
{
"name": "tinygltf",
"version>=": "2.9.4"
"version>=": "3.0.0#1"
},
"cli11",
"hash-library"
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/carbonengine/vcpkg-registry
Submodule vcpkg-registry updated 144 files
2 changes: 1 addition & 1 deletion vendor/github.com/microsoft/vcpkg
Submodule vcpkg updated 9899 files