diff options
| author | Leon Kang <2090093273@qq.com> | 2024-10-03 22:05:05 -0700 |
|---|---|---|
| committer | Leon Kang <2090093273@qq.com> | 2024-10-03 22:05:05 -0700 |
| commit | f7d8c400a629076d1de501739ea9faa2189bdca2 (patch) | |
| tree | f82c0bb76d37cc228fc323b3489209abc0735b80 | |
| parent | 1f47c662a07ec83d4033b1a5f4b48dd8dfa58b7b (diff) | |
| download | iris-f7d8c400a629076d1de501739ea9faa2189bdca2.tar.gz iris-f7d8c400a629076d1de501739ea9faa2189bdca2.zip | |
fix windows compilation errorswindows-build
| -rw-r--r-- | src/vulkan_helper.cpp | 2 | ||||
| -rw-r--r-- | 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<std::string> layers, std::vector<std::string> 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, @@ -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 |