diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d3f36cc1..2ebe7a333 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1774,37 +1774,37 @@ set(LOVE_SRC_3P_VOLK # set(LOVE_SRC_3P_VULKAN_HEADERS - src/libraries/vulkan-headers/vk_icd.h - src/libraries/vulkan-headers/vk_layer.h - src/libraries/vulkan-headers/vk_platform.h - src/libraries/vulkan-headers/vk_sdk-platform.h - src/libraries/vulkan-headers/vulkan_android.h - src/libraries/vulkan-headers/vulkan_beta.h - src/libraries/vulkan-headers/vulkan_core.h - src/libraries/vulkan-headers/vulkan_directfb.h - src/libraries/vulkan-headers/vulkan_enums.hpp - src/libraries/vulkan-headers/vulkan_format_traits.hpp - src/libraries/vulkan-headers/vulkan_fuchsia.h - src/libraries/vulkan-headers/vulkan_funcs.h - src/libraries/vulkan-headers/vulkan_ggp.h - src/libraries/vulkan-headers/vulkan_handles.h - src/libraries/vulkan-headers/vulkan_hash.hpp - src/libraries/vulkan-headers/vulkan_ios.h - src/libraries/vulkan-headers/vulkan_macos.h - src/libraries/vulkan-headers/vulkan_metal.h - src/libraries/vulkan-headers/vulkan_raii.hpp - src/libraries/vulkan-headers/vulkan_screen.h - src/libraries/vulkan-headers/vulkan_static_assertions.h - src/libraries/vulkan-headers/vulkan_structs.hpp - src/libraries/vulkan-headers/vulkan_to_string.h - src/libraries/vulkan-headers/vulkan_vi.h - src/libraries/vulkan-headers/vulkan_wayland.h - src/libraries/vulkan-headers/vulkan_win32.h - src/libraries/vulkan-headers/vulkan_xcb.h - src/libraries/vulkan-headers/vulkan_xlib_xrandr.h - src/libraries/vulkan-headers/vulkan_xlib.h - src/libraries/vulkan-headers/vulkan.h - src/libraries/vulkan-headers/vulkan.hpp + src/libraries/vulkanheaders/vk_icd.h + src/libraries/vulkanheaders/vk_layer.h + src/libraries/vulkanheaders/vk_platform.h + src/libraries/vulkanheaders/vk_sdk-platform.h + src/libraries/vulkanheaders/vulkan_android.h + src/libraries/vulkanheaders/vulkan_beta.h + src/libraries/vulkanheaders/vulkan_core.h + src/libraries/vulkanheaders/vulkan_directfb.h + src/libraries/vulkanheaders/vulkan_enums.hpp + src/libraries/vulkanheaders/vulkan_format_traits.hpp + src/libraries/vulkanheaders/vulkan_fuchsia.h + src/libraries/vulkanheaders/vulkan_funcs.h + src/libraries/vulkanheaders/vulkan_ggp.h + src/libraries/vulkanheaders/vulkan_handles.h + src/libraries/vulkanheaders/vulkan_hash.hpp + src/libraries/vulkanheaders/vulkan_ios.h + src/libraries/vulkanheaders/vulkan_macos.h + src/libraries/vulkanheaders/vulkan_metal.h + src/libraries/vulkanheaders/vulkan_raii.hpp + src/libraries/vulkanheaders/vulkan_screen.h + src/libraries/vulkanheaders/vulkan_static_assertions.h + src/libraries/vulkanheaders/vulkan_structs.hpp + src/libraries/vulkanheaders/vulkan_to_string.h + src/libraries/vulkanheaders/vulkan_vi.h + src/libraries/vulkanheaders/vulkan_wayland.h + src/libraries/vulkanheaders/vulkan_win32.h + src/libraries/vulkanheaders/vulkan_xcb.h + src/libraries/vulkanheaders/vulkan_xlib_xrandr.h + src/libraries/vulkanheaders/vulkan_xlib.h + src/libraries/vulkanheaders/vulkan.h + src/libraries/vulkanheaders/vulkan.hpp ) # vulkan headers has no implementation files of its own. diff --git a/src/libraries/vulkan-headers/vk_icd.h b/src/libraries/vulkanheaders/vk_icd.h similarity index 100% rename from src/libraries/vulkan-headers/vk_icd.h rename to src/libraries/vulkanheaders/vk_icd.h diff --git a/src/libraries/vulkan-headers/vk_layer.h b/src/libraries/vulkanheaders/vk_layer.h similarity index 100% rename from src/libraries/vulkan-headers/vk_layer.h rename to src/libraries/vulkanheaders/vk_layer.h diff --git a/src/libraries/vulkan-headers/vk_platform.h b/src/libraries/vulkanheaders/vk_platform.h similarity index 100% rename from src/libraries/vulkan-headers/vk_platform.h rename to src/libraries/vulkanheaders/vk_platform.h diff --git a/src/libraries/vulkan-headers/vk_sdk_platform.h b/src/libraries/vulkanheaders/vk_sdk_platform.h similarity index 100% rename from src/libraries/vulkan-headers/vk_sdk_platform.h rename to src/libraries/vulkanheaders/vk_sdk_platform.h diff --git a/src/libraries/vulkan-headers/vulkan.h b/src/libraries/vulkanheaders/vulkan.h similarity index 100% rename from src/libraries/vulkan-headers/vulkan.h rename to src/libraries/vulkanheaders/vulkan.h diff --git a/src/libraries/vulkan-headers/vulkan.hpp b/src/libraries/vulkanheaders/vulkan.hpp similarity index 100% rename from src/libraries/vulkan-headers/vulkan.hpp rename to src/libraries/vulkanheaders/vulkan.hpp diff --git a/src/libraries/vulkan-headers/vulkan_android.h b/src/libraries/vulkanheaders/vulkan_android.h similarity index 100% rename from src/libraries/vulkan-headers/vulkan_android.h rename to src/libraries/vulkanheaders/vulkan_android.h diff --git a/src/libraries/vulkan-headers/vulkan_beta.h b/src/libraries/vulkanheaders/vulkan_beta.h similarity index 100% rename from src/libraries/vulkan-headers/vulkan_beta.h rename to src/libraries/vulkanheaders/vulkan_beta.h diff --git a/src/libraries/vulkan-headers/vulkan_core.h b/src/libraries/vulkanheaders/vulkan_core.h similarity index 100% rename from src/libraries/vulkan-headers/vulkan_core.h rename to src/libraries/vulkanheaders/vulkan_core.h diff --git a/src/libraries/vulkan-headers/vulkan_directfb.h b/src/libraries/vulkanheaders/vulkan_directfb.h similarity index 100% rename from src/libraries/vulkan-headers/vulkan_directfb.h rename to src/libraries/vulkanheaders/vulkan_directfb.h diff --git a/src/libraries/vulkan-headers/vulkan_enums.hpp b/src/libraries/vulkanheaders/vulkan_enums.hpp similarity index 100% rename from src/libraries/vulkan-headers/vulkan_enums.hpp rename to src/libraries/vulkanheaders/vulkan_enums.hpp diff --git a/src/libraries/vulkan-headers/vulkan_format_traits.hpp b/src/libraries/vulkanheaders/vulkan_format_traits.hpp similarity index 100% rename from src/libraries/vulkan-headers/vulkan_format_traits.hpp rename to src/libraries/vulkanheaders/vulkan_format_traits.hpp diff --git a/src/libraries/vulkan-headers/vulkan_fuchsia.h b/src/libraries/vulkanheaders/vulkan_fuchsia.h similarity index 100% rename from src/libraries/vulkan-headers/vulkan_fuchsia.h rename to src/libraries/vulkanheaders/vulkan_fuchsia.h diff --git a/src/libraries/vulkan-headers/vulkan_funcs.hpp b/src/libraries/vulkanheaders/vulkan_funcs.hpp similarity index 100% rename from src/libraries/vulkan-headers/vulkan_funcs.hpp rename to src/libraries/vulkanheaders/vulkan_funcs.hpp diff --git a/src/libraries/vulkan-headers/vulkan_ggp.h b/src/libraries/vulkanheaders/vulkan_ggp.h similarity index 100% rename from src/libraries/vulkan-headers/vulkan_ggp.h rename to src/libraries/vulkanheaders/vulkan_ggp.h diff --git a/src/libraries/vulkan-headers/vulkan_handles.hpp b/src/libraries/vulkanheaders/vulkan_handles.hpp similarity index 100% rename from src/libraries/vulkan-headers/vulkan_handles.hpp rename to src/libraries/vulkanheaders/vulkan_handles.hpp diff --git a/src/libraries/vulkan-headers/vulkan_hash.hpp b/src/libraries/vulkanheaders/vulkan_hash.hpp similarity index 100% rename from src/libraries/vulkan-headers/vulkan_hash.hpp rename to src/libraries/vulkanheaders/vulkan_hash.hpp diff --git a/src/libraries/vulkan-headers/vulkan_ios.h b/src/libraries/vulkanheaders/vulkan_ios.h similarity index 100% rename from src/libraries/vulkan-headers/vulkan_ios.h rename to src/libraries/vulkanheaders/vulkan_ios.h diff --git a/src/libraries/vulkan-headers/vulkan_macos.h b/src/libraries/vulkanheaders/vulkan_macos.h similarity index 100% rename from src/libraries/vulkan-headers/vulkan_macos.h rename to src/libraries/vulkanheaders/vulkan_macos.h diff --git a/src/libraries/vulkan-headers/vulkan_metal.h b/src/libraries/vulkanheaders/vulkan_metal.h similarity index 100% rename from src/libraries/vulkan-headers/vulkan_metal.h rename to src/libraries/vulkanheaders/vulkan_metal.h diff --git a/src/libraries/vulkan-headers/vulkan_raii.hpp b/src/libraries/vulkanheaders/vulkan_raii.hpp similarity index 100% rename from src/libraries/vulkan-headers/vulkan_raii.hpp rename to src/libraries/vulkanheaders/vulkan_raii.hpp diff --git a/src/libraries/vulkan-headers/vulkan_screen.h b/src/libraries/vulkanheaders/vulkan_screen.h similarity index 100% rename from src/libraries/vulkan-headers/vulkan_screen.h rename to src/libraries/vulkanheaders/vulkan_screen.h diff --git a/src/libraries/vulkan-headers/vulkan_static_assertions.hpp b/src/libraries/vulkanheaders/vulkan_static_assertions.hpp similarity index 100% rename from src/libraries/vulkan-headers/vulkan_static_assertions.hpp rename to src/libraries/vulkanheaders/vulkan_static_assertions.hpp diff --git a/src/libraries/vulkan-headers/vulkan_structs.hpp b/src/libraries/vulkanheaders/vulkan_structs.hpp similarity index 100% rename from src/libraries/vulkan-headers/vulkan_structs.hpp rename to src/libraries/vulkanheaders/vulkan_structs.hpp diff --git a/src/libraries/vulkan-headers/vulkan_to_string.hpp b/src/libraries/vulkanheaders/vulkan_to_string.hpp similarity index 100% rename from src/libraries/vulkan-headers/vulkan_to_string.hpp rename to src/libraries/vulkanheaders/vulkan_to_string.hpp diff --git a/src/libraries/vulkan-headers/vulkan_vi.h b/src/libraries/vulkanheaders/vulkan_vi.h similarity index 100% rename from src/libraries/vulkan-headers/vulkan_vi.h rename to src/libraries/vulkanheaders/vulkan_vi.h diff --git a/src/libraries/vulkan-headers/vulkan_wayland.h b/src/libraries/vulkanheaders/vulkan_wayland.h similarity index 100% rename from src/libraries/vulkan-headers/vulkan_wayland.h rename to src/libraries/vulkanheaders/vulkan_wayland.h diff --git a/src/libraries/vulkan-headers/vulkan_win32.h b/src/libraries/vulkanheaders/vulkan_win32.h similarity index 100% rename from src/libraries/vulkan-headers/vulkan_win32.h rename to src/libraries/vulkanheaders/vulkan_win32.h diff --git a/src/libraries/vulkan-headers/vulkan_xcb.h b/src/libraries/vulkanheaders/vulkan_xcb.h similarity index 100% rename from src/libraries/vulkan-headers/vulkan_xcb.h rename to src/libraries/vulkanheaders/vulkan_xcb.h diff --git a/src/libraries/vulkan-headers/vulkan_xlib.h b/src/libraries/vulkanheaders/vulkan_xlib.h similarity index 100% rename from src/libraries/vulkan-headers/vulkan_xlib.h rename to src/libraries/vulkanheaders/vulkan_xlib.h diff --git a/src/libraries/vulkan-headers/vulkan_xlib_xrandr.h b/src/libraries/vulkanheaders/vulkan_xlib_xrandr.h similarity index 100% rename from src/libraries/vulkan-headers/vulkan_xlib_xrandr.h rename to src/libraries/vulkanheaders/vulkan_xlib_xrandr.h diff --git a/src/modules/graphics/vulkan/VulkanWrapper.h b/src/modules/graphics/vulkan/VulkanWrapper.h index 260d57065..18932e8b2 100644 --- a/src/modules/graphics/vulkan/VulkanWrapper.h +++ b/src/modules/graphics/vulkan/VulkanWrapper.h @@ -21,7 +21,7 @@ #pragma once #define VK_NO_PROTOTYPES -#include "libraries/vulkan-headers/vulkan.h" +#include "libraries/vulkanheaders/vulkan.h" #ifndef VK_MAKE_API_VERSION #define VK_MAKE_API_VERSION(variant, major, minor, patch) \