diff --git a/.clang-format b/.clang-format index 46ee31a763391f65d384d091ec906517bf5ccd1d..b8dc5af3d8de54958b8f554b1a35125abe918cc0 100644 --- a/.clang-format +++ b/.clang-format @@ -84,13 +84,13 @@ IfMacros: [ 'IF' ] IncludeBlocks: Regroup IncludeCategories: - Regex: '^<glm/' - Priority: 1 - - Regex: '^<vulkan/' Priority: 2 - - Regex: '<vk_mem_alloc.h>' + - Regex: '^<vulkan/' Priority: 3 - - Regex: '^<glfw/' + - Regex: '^<vk_mem_alloc.h>' Priority: 4 + - Regex: '^<GLFW/' + Priority: 5 - Regex: '^<.*\..*' Priority: 998 - Regex: '^<.*' diff --git a/CMakeLists.txt b/CMakeLists.txt index abab48aa82a85c038a563e5f4dd32e23927c527d..80c04f42f2187068a1940e057b5b7de502f0f09d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,13 +85,13 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE target_link_libraries(${PROJECT_NAME} PRIVATE VulkanMemoryAllocator) # GLFW -FetchContent_Declare(GLFW +FetchContent_Declare(glfw3 GIT_REPOSITORY https://github.com/glfw/glfw.git GIT_TAG 3.4 GIT_PROGRESS TRUE SYSTEM ) -FetchContent_MakeAvailable(GLFW) +FetchContent_MakeAvailable(glfw3) target_compile_definitions(${PROJECT_NAME} PRIVATE GLFW_INCLUDE_VULKAN ) diff --git a/src/main.cpp b/src/main.cpp index 54e778569d47041fd567fa669db60c6230d5d6b7..d268e93816d10c5699354a97606c6ee04a9c2907 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,6 +1,18 @@ #include <iostream> +#include <glm/glm.hpp> + +#include <vulkan/vulkan.hpp> + +#include <vk_mem_alloc.h> + +#include <GLFW/glfw3.h> + int main() { - std::cout << "Hello World!\n"; + std::cout << GLM_VERSION_MESSAGE << '\n'; + std::cout << "Vulkan-Hpp C++ version: " << VULKAN_HPP_CPP_VERSION << '\n'; + std::cout << "Vulkan Version found by VMA: " << VMA_VULKAN_VERSION << '\n'; + std::cout << "GLFW version: " << GLFW_VERSION_MAJOR << '.' + << GLFW_VERSION_MINOR << '\n'; }