windows build fix

2026-03-02 23:53:13 +01:00 · 2026-03-02 23:53:13 +01:00 · 72bf6c83e1
commit 72bf6c83e1
parent 2a22365d63
23 changed files with 37 additions and 28 deletions
--- a/examples/VulkanAnimation/main.cpp
+++ b/examples/VulkanAnimation/main.cpp
@ -1,4 +1,4 @@
-#include <vulkan/vulkan.h>
+#include "vulkan/vulkan.h"

 import Crafter.Graphics;
 using namespace Crafter;
--- a/examples/VulkanTriangle/main.cpp
+++ b/examples/VulkanTriangle/main.cpp
@ -1,4 +1,4 @@
-#include <vulkan/vulkan.h>
+#include "vulkan/vulkan.h"

 import Crafter.Graphics;
 using namespace Crafter;
--- a/examples/VulkanTriangleRuntime/main.cpp
+++ b/examples/VulkanTriangleRuntime/main.cpp
@ -1,4 +1,4 @@
-#include <vulkan/vulkan.h>
+#include "vulkan/vulkan.h"

 import Crafter.Graphics;
 using namespace Crafter;
--- a/examples/VulkanWindow/main.cpp
+++ b/examples/VulkanWindow/main.cpp
@ -1,4 +1,4 @@
-#include <vulkan/vulkan.h>
+#include "vulkan/vulkan.h"

 import Crafter.Graphics;
 using namespace Crafter;
--- 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 <vulkan/vulkan.h>
+#include "vulkan/vulkan.h"

 module Crafter.Graphics:Mesh_impl;
 import Crafter.Math;
--- 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 <vulkan/vulkan.h>
-#include <vulkan/vk_enum_string_helper.h>
+#include "vulkan/vulkan.h"
+#include "vulkan/vk_enums.h"

 #define GET_EXTENSION_FUNCTION(_id) ((PFN_##_id)(vkGetInstanceProcAddr(instance, #_id)))

--- a/implementations/Crafter.Graphics-Window_vulkan.cpp
+++ b/implementations/Crafter.Graphics-Window_vulkan.cpp
@ -38,8 +38,8 @@ module;
 #include <print>
 #include <wayland-client.h>
 #include <wayland-client-protocol.h>
-#include <vulkan/vulkan.h>
-#include <vulkan/vulkan_wayland.h>
+#include "vulkan/vulkan.h"
+#include "vulkan/vulkan_wayland.h"

 module Crafter.Graphics:Window_vulkan_impl;
 import :Window;
--- 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 <windows.h>
-#include <vulkan/vulkan.h>
-#include <vulkan/vulkan_win32.h>
+#include "vulkan/vulkan.h"
+#include "vulkan/vulkan_win32.h"
 #include <cassert>
 module Crafter.Graphics:Window_wayland_impl;
 import :Window;
--- 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 <vulkan/vulkan.h>
+#include "vulkan/vulkan.h"
 #endif
 export module Crafter.Graphics:DescriptorPoolVulkan;
 #ifdef CRAFTER_GRAPHICS_VULKAN
--- 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 <vulkan/vulkan.h>
+#include "vulkan/vulkan.h"
 #endif
 export module Crafter.Graphics:DescriptorSetLayoutVulkan;
 #ifdef CRAFTER_GRAPHICS_VULKAN
--- 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 <vulkan/vulkan.h>
+#include "vulkan/vulkan.h"
 #endif

 export module Crafter.Graphics:ImageVulkan;
--- 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 <vulkan/vulkan.h>
+#include "vulkan/vulkan.h"
 #endif

 export module Crafter.Graphics:Mesh;
--- 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 <vulkan/vulkan.h>
+#include "vulkan/vulkan.h"
 #endif
 export module Crafter.Graphics:PipelineRTVulkan;
 #ifdef CRAFTER_GRAPHICS_VULKAN
--- 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 <vulkan/vulkan.h>
+#include "vulkan/vulkan.h"
 #endif
 export module Crafter.Graphics:RenderingElement3DVulkan;
 #ifdef CRAFTER_GRAPHICS_VULKAN
--- 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 <vulkan/vulkan.h>
+#include "vulkan/vulkan.h"
 #endif

 export module Crafter.Graphics:SamplerVulkan;
--- 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 <vulkan/vulkan.h>
+#include "vulkan/vulkan.h"
 #endif
 export module Crafter.Graphics:ShaderBindingTableVulkan;
 #ifdef CRAFTER_GRAPHICS_VULKAN
--- 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 <vulkan/vulkan.h>
+#include "vulkan/vulkan.h"
 #endif
 export module Crafter.Graphics:ShaderVulkan;
 #ifdef CRAFTER_GRAPHICS_VULKAN
--- 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 <vulkan/vulkan.h>
+#include "vulkan/vulkan.h"
 #endif
 export module Crafter.Graphics:Types;
 import std;
--- 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 <vulkan/vulkan.h>
+#include "vulkan/vulkan.h"
 #endif

 export module Crafter.Graphics:VulkanBuffer;
--- 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 <vulkan/vulkan.h>
+#include "vulkan/vulkan.h"
 #endif
 export module Crafter.Graphics:VulkanDevice;
 #ifdef CRAFTER_GRAPHICS_VULKAN
--- 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 <vulkan/vulkan.h>
+#include "vulkan/vulkan.h"
 #include <assert.h>
 #endif
 export module Crafter.Graphics:VulkanTransition;
@ -27,7 +27,7 @@ export module Crafter.Graphics:VulkanTransition;
 import std;

 export namespace Crafter {
- #include <vulkan/vulkan.h>
+ #include "vulkan/vulkan.h"



--- a/interfaces/Crafter.Graphics-Window.cppm
+++ b/interfaces/Crafter.Graphics-Window.cppm
@ -60,10 +60,10 @@ module;
 #include <print>
 #include <wayland-client.h>
 #include <wayland-client-protocol.h>
-#include <vulkan/vulkan.h>
-#include <vulkan/vulkan_wayland.h>
+#include "vulkan/vulkan.h"
+#include "vulkan/vulkan_wayland.h"
 #else
-#include <vulkan/vulkan.h>
+#include "vulkan/vulkan.h"
 #endif
 #endif

--- 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": [