From 72bf6c83e1dca00d195d266e6cf2bfef011a3c6d Mon Sep 17 00:00:00 2001 From: Jorijn van der Graaf Date: Mon, 2 Mar 2026 23:53:13 +0100 Subject: [PATCH] windows build fix --- examples/VulkanAnimation/main.cpp | 2 +- examples/VulkanTriangle/main.cpp | 2 +- examples/VulkanTriangleRuntime/main.cpp | 2 +- examples/VulkanWindow/main.cpp | 2 +- implementations/Crafter.Graphics-Mesh_vulkan.cpp | 2 +- implementations/Crafter.Graphics-VulkanDevice.cpp | 4 ++-- implementations/Crafter.Graphics-Window_vulkan.cpp | 4 ++-- .../Crafter.Graphics-Window_vulkan_windows.cpp | 4 ++-- interfaces/Crafter.Graphics-DescriptorPoolVulkan.cppm | 2 +- .../Crafter.Graphics-DescriptorSetLayoutVulkan.cppm | 2 +- interfaces/Crafter.Graphics-ImageVulkan.cppm | 2 +- interfaces/Crafter.Graphics-Mesh.cppm | 2 +- interfaces/Crafter.Graphics-PipelineRTVulkan.cppm | 2 +- .../Crafter.Graphics-RenderingElement3DVulkan.cppm | 2 +- interfaces/Crafter.Graphics-SamplerVulkan.cppm | 2 +- .../Crafter.Graphics-ShaderBindingTableVulkan.cppm | 2 +- interfaces/Crafter.Graphics-ShaderVulkan.cppm | 2 +- interfaces/Crafter.Graphics-Types.cppm | 2 +- interfaces/Crafter.Graphics-VulkanBuffer.cppm | 2 +- interfaces/Crafter.Graphics-VulkanDevice.cppm | 2 +- interfaces/Crafter.Graphics-VulkanTransition.cppm | 4 ++-- interfaces/Crafter.Graphics-Window.cppm | 6 +++--- project.json | 9 +++++++++ 23 files changed, 37 insertions(+), 28 deletions(-) diff --git a/examples/VulkanAnimation/main.cpp b/examples/VulkanAnimation/main.cpp index ede4061..7baded2 100644 --- a/examples/VulkanAnimation/main.cpp +++ b/examples/VulkanAnimation/main.cpp @@ -1,4 +1,4 @@ -#include +#include "vulkan/vulkan.h" import Crafter.Graphics; using namespace Crafter; diff --git a/examples/VulkanTriangle/main.cpp b/examples/VulkanTriangle/main.cpp index 029a248..79a3d2f 100644 --- a/examples/VulkanTriangle/main.cpp +++ b/examples/VulkanTriangle/main.cpp @@ -1,4 +1,4 @@ -#include +#include "vulkan/vulkan.h" import Crafter.Graphics; using namespace Crafter; diff --git a/examples/VulkanTriangleRuntime/main.cpp b/examples/VulkanTriangleRuntime/main.cpp index 04b5907..07b8661 100644 --- a/examples/VulkanTriangleRuntime/main.cpp +++ b/examples/VulkanTriangleRuntime/main.cpp @@ -1,4 +1,4 @@ -#include +#include "vulkan/vulkan.h" import Crafter.Graphics; using namespace Crafter; diff --git a/examples/VulkanWindow/main.cpp b/examples/VulkanWindow/main.cpp index 5c20e9f..db636fe 100644 --- a/examples/VulkanWindow/main.cpp +++ b/examples/VulkanWindow/main.cpp @@ -1,4 +1,4 @@ -#include +#include "vulkan/vulkan.h" import Crafter.Graphics; using namespace Crafter; diff --git a/implementations/Crafter.Graphics-Mesh_vulkan.cpp b/implementations/Crafter.Graphics-Mesh_vulkan.cpp index 472ff8a..507fc55 100644 --- a/implementations/Crafter.Graphics-Mesh_vulkan.cpp +++ b/implementations/Crafter.Graphics-Mesh_vulkan.cpp @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA module; -#include +#include "vulkan/vulkan.h" module Crafter.Graphics:Mesh_impl; import Crafter.Math; diff --git a/implementations/Crafter.Graphics-VulkanDevice.cpp b/implementations/Crafter.Graphics-VulkanDevice.cpp index af110ba..18029f2 100644 --- a/implementations/Crafter.Graphics-VulkanDevice.cpp +++ b/implementations/Crafter.Graphics-VulkanDevice.cpp @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA module; -#include -#include +#include "vulkan/vulkan.h" +#include "vulkan/vk_enums.h" #define GET_EXTENSION_FUNCTION(_id) ((PFN_##_id)(vkGetInstanceProcAddr(instance, #_id))) diff --git a/implementations/Crafter.Graphics-Window_vulkan.cpp b/implementations/Crafter.Graphics-Window_vulkan.cpp index 952c40f..270b048 100644 --- a/implementations/Crafter.Graphics-Window_vulkan.cpp +++ b/implementations/Crafter.Graphics-Window_vulkan.cpp @@ -38,8 +38,8 @@ module; #include #include #include -#include -#include +#include "vulkan/vulkan.h" +#include "vulkan/vulkan_wayland.h" module Crafter.Graphics:Window_vulkan_impl; import :Window; diff --git a/implementations/Crafter.Graphics-Window_vulkan_windows.cpp b/implementations/Crafter.Graphics-Window_vulkan_windows.cpp index 24d868f..581c69c 100644 --- a/implementations/Crafter.Graphics-Window_vulkan_windows.cpp +++ b/implementations/Crafter.Graphics-Window_vulkan_windows.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA module; #include -#include -#include +#include "vulkan/vulkan.h" +#include "vulkan/vulkan_win32.h" #include module Crafter.Graphics:Window_wayland_impl; import :Window; diff --git a/interfaces/Crafter.Graphics-DescriptorPoolVulkan.cppm b/interfaces/Crafter.Graphics-DescriptorPoolVulkan.cppm index 562fc36..f50f6c9 100644 --- a/interfaces/Crafter.Graphics-DescriptorPoolVulkan.cppm +++ b/interfaces/Crafter.Graphics-DescriptorPoolVulkan.cppm @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA module; #ifdef CRAFTER_GRAPHICS_VULKAN -#include +#include "vulkan/vulkan.h" #endif export module Crafter.Graphics:DescriptorPoolVulkan; #ifdef CRAFTER_GRAPHICS_VULKAN diff --git a/interfaces/Crafter.Graphics-DescriptorSetLayoutVulkan.cppm b/interfaces/Crafter.Graphics-DescriptorSetLayoutVulkan.cppm index 20559d3..cff916f 100644 --- a/interfaces/Crafter.Graphics-DescriptorSetLayoutVulkan.cppm +++ b/interfaces/Crafter.Graphics-DescriptorSetLayoutVulkan.cppm @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA module; #ifdef CRAFTER_GRAPHICS_VULKAN -#include +#include "vulkan/vulkan.h" #endif export module Crafter.Graphics:DescriptorSetLayoutVulkan; #ifdef CRAFTER_GRAPHICS_VULKAN diff --git a/interfaces/Crafter.Graphics-ImageVulkan.cppm b/interfaces/Crafter.Graphics-ImageVulkan.cppm index 2f64308..22efd2a 100644 --- a/interfaces/Crafter.Graphics-ImageVulkan.cppm +++ b/interfaces/Crafter.Graphics-ImageVulkan.cppm @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 0215-1301 USA module; #ifdef CRAFTER_GRAPHICS_VULKAN -#include +#include "vulkan/vulkan.h" #endif export module Crafter.Graphics:ImageVulkan; diff --git a/interfaces/Crafter.Graphics-Mesh.cppm b/interfaces/Crafter.Graphics-Mesh.cppm index 96603d8..bfee5e4 100644 --- a/interfaces/Crafter.Graphics-Mesh.cppm +++ b/interfaces/Crafter.Graphics-Mesh.cppm @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA module; #ifdef CRAFTER_GRAPHICS_VULKAN -#include +#include "vulkan/vulkan.h" #endif export module Crafter.Graphics:Mesh; diff --git a/interfaces/Crafter.Graphics-PipelineRTVulkan.cppm b/interfaces/Crafter.Graphics-PipelineRTVulkan.cppm index 151bfaf..d2cec11 100644 --- a/interfaces/Crafter.Graphics-PipelineRTVulkan.cppm +++ b/interfaces/Crafter.Graphics-PipelineRTVulkan.cppm @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA module; #ifdef CRAFTER_GRAPHICS_VULKAN -#include +#include "vulkan/vulkan.h" #endif export module Crafter.Graphics:PipelineRTVulkan; #ifdef CRAFTER_GRAPHICS_VULKAN diff --git a/interfaces/Crafter.Graphics-RenderingElement3DVulkan.cppm b/interfaces/Crafter.Graphics-RenderingElement3DVulkan.cppm index 5f73b1b..eade599 100644 --- a/interfaces/Crafter.Graphics-RenderingElement3DVulkan.cppm +++ b/interfaces/Crafter.Graphics-RenderingElement3DVulkan.cppm @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA module; #ifdef CRAFTER_GRAPHICS_VULKAN -#include +#include "vulkan/vulkan.h" #endif export module Crafter.Graphics:RenderingElement3DVulkan; #ifdef CRAFTER_GRAPHICS_VULKAN diff --git a/interfaces/Crafter.Graphics-SamplerVulkan.cppm b/interfaces/Crafter.Graphics-SamplerVulkan.cppm index 3accd1a..42a0a1d 100644 --- a/interfaces/Crafter.Graphics-SamplerVulkan.cppm +++ b/interfaces/Crafter.Graphics-SamplerVulkan.cppm @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA module; #ifdef CRAFTER_GRAPHICS_VULKAN -#include +#include "vulkan/vulkan.h" #endif export module Crafter.Graphics:SamplerVulkan; diff --git a/interfaces/Crafter.Graphics-ShaderBindingTableVulkan.cppm b/interfaces/Crafter.Graphics-ShaderBindingTableVulkan.cppm index 5bea053..af0edaa 100644 --- a/interfaces/Crafter.Graphics-ShaderBindingTableVulkan.cppm +++ b/interfaces/Crafter.Graphics-ShaderBindingTableVulkan.cppm @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA module; #ifdef CRAFTER_GRAPHICS_VULKAN -#include +#include "vulkan/vulkan.h" #endif export module Crafter.Graphics:ShaderBindingTableVulkan; #ifdef CRAFTER_GRAPHICS_VULKAN diff --git a/interfaces/Crafter.Graphics-ShaderVulkan.cppm b/interfaces/Crafter.Graphics-ShaderVulkan.cppm index d9014f8..9dc2899 100644 --- a/interfaces/Crafter.Graphics-ShaderVulkan.cppm +++ b/interfaces/Crafter.Graphics-ShaderVulkan.cppm @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA module; #ifdef CRAFTER_GRAPHICS_VULKAN -#include +#include "vulkan/vulkan.h" #endif export module Crafter.Graphics:ShaderVulkan; #ifdef CRAFTER_GRAPHICS_VULKAN diff --git a/interfaces/Crafter.Graphics-Types.cppm b/interfaces/Crafter.Graphics-Types.cppm index bc7d7c4..7ea1669 100644 --- a/interfaces/Crafter.Graphics-Types.cppm +++ b/interfaces/Crafter.Graphics-Types.cppm @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ module; #ifdef CRAFTER_GRAPHICS_VULKAN -#include +#include "vulkan/vulkan.h" #endif export module Crafter.Graphics:Types; import std; diff --git a/interfaces/Crafter.Graphics-VulkanBuffer.cppm b/interfaces/Crafter.Graphics-VulkanBuffer.cppm index f72aa38..96ae436 100644 --- a/interfaces/Crafter.Graphics-VulkanBuffer.cppm +++ b/interfaces/Crafter.Graphics-VulkanBuffer.cppm @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA module; #ifdef CRAFTER_GRAPHICS_VULKAN -#include +#include "vulkan/vulkan.h" #endif export module Crafter.Graphics:VulkanBuffer; diff --git a/interfaces/Crafter.Graphics-VulkanDevice.cppm b/interfaces/Crafter.Graphics-VulkanDevice.cppm index 7d7c176..df87abd 100644 --- a/interfaces/Crafter.Graphics-VulkanDevice.cppm +++ b/interfaces/Crafter.Graphics-VulkanDevice.cppm @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA module; #ifdef CRAFTER_GRAPHICS_VULKAN -#include +#include "vulkan/vulkan.h" #endif export module Crafter.Graphics:VulkanDevice; #ifdef CRAFTER_GRAPHICS_VULKAN diff --git a/interfaces/Crafter.Graphics-VulkanTransition.cppm b/interfaces/Crafter.Graphics-VulkanTransition.cppm index c81a9ce..82971d6 100644 --- a/interfaces/Crafter.Graphics-VulkanTransition.cppm +++ b/interfaces/Crafter.Graphics-VulkanTransition.cppm @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA module; #ifdef CRAFTER_GRAPHICS_VULKAN -#include +#include "vulkan/vulkan.h" #include #endif export module Crafter.Graphics:VulkanTransition; @@ -27,7 +27,7 @@ export module Crafter.Graphics:VulkanTransition; import std; export namespace Crafter { - #include + #include "vulkan/vulkan.h" diff --git a/interfaces/Crafter.Graphics-Window.cppm b/interfaces/Crafter.Graphics-Window.cppm index ad4c908..f0d1a4b 100644 --- a/interfaces/Crafter.Graphics-Window.cppm +++ b/interfaces/Crafter.Graphics-Window.cppm @@ -60,10 +60,10 @@ module; #include #include #include -#include -#include +#include "vulkan/vulkan.h" +#include "vulkan/vulkan_wayland.h" #else -#include +#include "vulkan/vulkan.h" #endif #endif diff --git a/project.json b/project.json index 8d98806..7ef7eff 100644 --- a/project.json +++ b/project.json @@ -48,6 +48,15 @@ } ] }, + { + "name":"deps-vk", + "dependencies": [ + { + "path":"https://github.com/KhronosGroup/Vulkan-Headers.git", + "type":"include" + } + ] + }, { "name": "deps", "dependencies": [