diff --git a/.teamcity/Windows/Project.kt b/.teamcity/Windows/Project.kt index 656997f..f2e1e8c 100644 --- a/.teamcity/Windows/Project.kt +++ b/.teamcity/Windows/Project.kt @@ -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 @@ -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") param("env.CMAKE_INSTALL_PREFIX", ".build-artifact") param("env.CMAKE_CONFIG_TYPE", configType) @@ -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%%'] diff --git a/CMakePresets.json b/CMakePresets.json index 4a18944..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" } }, { diff --git a/src/processor/cmffile.cpp b/src/processor/cmffile.cpp index d421fdc..c09f8bd 100644 --- a/src/processor/cmffile.cpp +++ b/src/processor/cmffile.cpp @@ -3,6 +3,7 @@ #include "cmffile.h" #include "cmf/compression.h" #include "cmf/writer.h" +#include // NOLINTBEGIN(cppcoreguidelines-owning-memory) std::vector ReadFile( const char* path ) diff --git a/src/viewer/data/cmfcontent.h b/src/viewer/data/cmfcontent.h index 58ace68..a29ef34 100644 --- a/src/viewer/data/cmfcontent.h +++ b/src/viewer/data/cmfcontent.h @@ -3,6 +3,8 @@ #pragma once #include +#include +#include // Simple owner class for the cmf data diff --git a/src/viewer/rendering/renderable/geometryprepass.cpp b/src/viewer/rendering/renderable/geometryprepass.cpp index 49cad27..6e7ab73 100644 --- a/src/viewer/rendering/renderable/geometryprepass.cpp +++ b/src/viewer/rendering/renderable/geometryprepass.cpp @@ -5,6 +5,7 @@ #include "cmf/declutils.h" #include "rendering/vulkan/vulkanerrors.h" #include +#include GeometryPrePass::GeometryPrePass( std::shared_ptr renderer, std::shared_ptr cmfContent, const cmf::Mesh& cmfMesh ) : m_cmfMesh( cmfMesh ), diff --git a/src/viewer/rendering/ui/uiCustomWidgets.h b/src/viewer/rendering/ui/uiCustomWidgets.h index 79b8202..18f237b 100644 --- a/src/viewer/rendering/ui/uiCustomWidgets.h +++ b/src/viewer/rendering/ui/uiCustomWidgets.h @@ -4,6 +4,7 @@ #include #include +#include #include "uiConsts.h" diff --git a/src/viewer/rendering/vulkan/shadercache.cpp b/src/viewer/rendering/vulkan/shadercache.cpp index 36a17f3..b00a8f7 100644 --- a/src/viewer/rendering/vulkan/shadercache.cpp +++ b/src/viewer/rendering/vulkan/shadercache.cpp @@ -4,6 +4,8 @@ #include +#include + #include "vulkanerrors.h" #include "vulkanenums.h" diff --git a/src/viewer/rendering/vulkan/texture.cpp b/src/viewer/rendering/vulkan/texture.cpp index 52fb8f5..0ade171 100644 --- a/src/viewer/rendering/vulkan/texture.cpp +++ b/src/viewer/rendering/vulkan/texture.cpp @@ -1,6 +1,7 @@ // Copyright © 2025 CCP ehf. #include "texture.h" +#include Texture::Texture() : m_image( VK_NULL_HANDLE ), diff --git a/vcpkg.json b/vcpkg.json index 841db5d..6786d2e 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -67,7 +67,7 @@ }, { "name": "tinygltf", - "version>=": "2.9.4" + "version>=": "3.0.0#1" }, "cli11", "hash-library" diff --git a/vendor/github.com/carbonengine/vcpkg-registry b/vendor/github.com/carbonengine/vcpkg-registry index db745f6..9e6fcd1 160000 --- a/vendor/github.com/carbonengine/vcpkg-registry +++ b/vendor/github.com/carbonengine/vcpkg-registry @@ -1 +1 @@ -Subproject commit db745f665067d785ae59648ddc35bf167a587733 +Subproject commit 9e6fcd1d95a468715e67e3b59fe3ed33658437de diff --git a/vendor/github.com/microsoft/vcpkg b/vendor/github.com/microsoft/vcpkg index 1d0f0a3..ddd0023 160000 --- a/vendor/github.com/microsoft/vcpkg +++ b/vendor/github.com/microsoft/vcpkg @@ -1 +1 @@ -Subproject commit 1d0f0a396cf00af25fbcb5550917c25ac64aa240 +Subproject commit ddd0023b0eee70986e42ed49d9d4afb8098f212e