From f7d8c400a629076d1de501739ea9faa2189bdca2 Mon Sep 17 00:00:00 2001 From: Leon Kang <2090093273@qq.com> Date: Thu, 3 Oct 2024 22:05:05 -0700 Subject: fix windows compilation errors --- src/vulkan_helper.cpp | 2 +- xmake.lua | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/vulkan_helper.cpp b/src/vulkan_helper.cpp index c281b2c..53e3454 100644 --- a/src/vulkan_helper.cpp +++ b/src/vulkan_helper.cpp @@ -182,7 +182,7 @@ Device::Device(std::vector layers, std::vector instanc } }; - constexpr char *device_extensions[] = { + constexpr const char *device_extensions[] = { VK_KHR_SWAPCHAIN_EXTENSION_NAME, VK_EXT_SHADER_ATOMIC_FLOAT_EXTENSION_NAME, VK_KHR_RAY_TRACING_PIPELINE_EXTENSION_NAME, diff --git a/xmake.lua b/xmake.lua index 1b9730f..1171462 100644 --- a/xmake.lua +++ b/xmake.lua @@ -1,4 +1,5 @@ add_rules("mode.debug", "mode.release") +add_requires("vulkansdk", "glfw", "fmt", "vulkan-memory-allocator", "spdlog", "glm") -- Project settings set_project("iris_renderer") @@ -27,6 +28,10 @@ target("imgui") path.join(imgui_dir, "backends/imgui_impl_vulkan.cpp") ) + if is_host("windows") then + add_packages("vulkansdk", "glfw") + end + -- Add include directories add_includedirs( imgui_dir, @@ -62,10 +67,10 @@ target("iris_renderer") -- Add libraries add_packages("vulkansdk", "glfw", "fmt", "vulkan-memory-allocator", "spdlog", "glm") - add_syslinks("vulkan", "glfw", "fmt") -- OS-specific libraries (dl, pthread, X11, etc.) if is_plat("linux") then + add_syslinks("vulkan", "glfw", "fmt") add_syslinks("dl", "pthread", "X11", "Xxf86vm", "Xrandr", "Xi") end -- cgit v1.2.3-70-g09d2