no more vulkan sdk installation step

Author: JeanPhilippeKernel

.gitmodules

@@ -49,9 +49,12 @@
 [submodule "__externals/SPIRV-Tools"]
 	path = __externals/SPIRV-Tools
 	url = https://github.com/khronosGroup/SPIRV-Tools
-[submodule "__externals/Vulkan-Headers"]
-	path = __externals/Vulkan-Headers
-	url = https://github.com/KhronosGroup/Vulkan-Headers
 [submodule "__externals/Vulkan-Loader"]
 	path = __externals/Vulkan-Loader
 	url = https://github.com/KhronosGroup/Vulkan-Loader
+[submodule "__externals/glm"]
+	path = __externals/glm
+	url = https://github.com/g-truc/glm
+[submodule "__externals/Vulkan-Headers"]
+	path = __externals/Vulkan-Headers
+	url = https://github.com/KhronosGroup/Vulkan-Headers

CMakeLists.txt

@@ -21,12 +21,11 @@ option (COPY_EXAMPLE_PROJECT "Copy example projects that show how to use Launche
 
 # Externals dependencies
 #
-set (IN_ENGINE_VULKAN_HEADER_PATH ${EXTERNAL_DIR}/Vulkan-Loader/external/${CMAKE_SYSTEM_NAME}/${CMAKE_BUILD_TYPE}/Vulkan-Headers/build/install/include)
-
 add_subdirectory (${EXTERNAL_DIR}/fmt)
 add_subdirectory (${EXTERNAL_DIR}/imgui)
 add_subdirectory (${EXTERNAL_DIR}/glfw)
 add_subdirectory (${EXTERNAL_DIR}/spdlog)
+add_subdirectory (${EXTERNAL_DIR}/glm)
 add_subdirectory (${EXTERNAL_DIR}/entt)
 add_subdirectory (${EXTERNAL_DIR}/assimp)
 add_subdirectory (${EXTERNAL_DIR}/stduuid)
@@ -40,7 +39,7 @@ add_subdirectory (${EXTERNAL_DIR}/VulkanMemoryAllocator)
 
 set (CMAKE_PREFIX_PATH
 	${CMAKE_PREFIX_PATH}
-	${EXTERNAL_DIR}/Vulkan-Loader/external/${CMAKE_SYSTEM_NAME}/${CMAKE_BUILD_TYPE}/Vulkan-Headers/build/install/share/cmake
+	${EXTERNAL_DIR}/Vulkan-Headers/build/install/share/cmake
 )
 add_subdirectory (${EXTERNAL_DIR}/Vulkan-Loader)
 

README.md

@@ -22,9 +22,6 @@ Before building, make sure your setup is correct :
 
 - Install Visual Studio 2022 Community or Professional, make sure to add "Desktop development with C++".
 - Install [PowerShell Core](https://github.com/PowerShell/PowerShell/releases)
-- Install [Vulkan SDK](https://sdk.lunarg.com/sdk/download/1.3.250.1/windows/VulkanSDK-1.3.250.1-Installer.exe)
-	- Be sure to check the following components:
-		- GLM headers
 - Install [Python](https://www.python.org/ftp/python/3.12.4/python-3.12.4-amd64.exe)
 
 ## Building 

Scripts/BuildEngine.ps1

@@ -78,6 +78,20 @@ $RepoRoot = [IO.Path]::Combine($PSScriptRoot, "..")
 Write-Host "Ensuring submodules are initialized and updated..."
 git -C $RepoRoot submodule update --init --recursive
 
+
+Write-Host "Configuring Vulkan-Header submodule..."
+
+$ExternalVulkanHeadersDir = Join-Path -Path $RepoRoot -ChildPath "__externals/Vulkan-Headers"
+$ExternalVulkanHeadersOutputDir = Join-Path -Path $ExternalVulkanHeadersDir -ChildPath "build"
+$ExternalVulkanHeadersInstallDir = Join-Path -Path $ExternalVulkanHeadersOutputDir -ChildPath "install"
+
+if(-Not (Test-Path -Path $ExternalVulkanHeadersInstallDir))
+{
+    & $cMakeProgram -S $ExternalVulkanHeadersDir -B $ExternalVulkanHeadersOutputDir
+    & $cMakeProgram --install $ExternalVulkanHeadersOutputDir --prefix $ExternalVulkanHeadersInstallDir
+}
+
+
 function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
 
     $architecture = 'x64'
@@ -123,7 +137,7 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
         'STDUUID'   = @("-DUUID_BUILD_TESTS=OFF", "-DUUID_USING_CXX20_SPAN=ON", "-DUUID_SYSTEM_GENERATOR=OFF");
         'YAMLCPP'   = @("-DYAML_CPP_BUILD_TOOLS=OFF", "-DYAML_CPP_BUILD_TESTS=OFF", "-DYAML_CPP_FORMAT_SOURCE=OFF", "-DYAML_BUILD_SHARED_LIBS=OFF");
         'FRAMEWORK' = @("-DBUILD_FRAMEWORK=ON");
-        'VULKAN_LOADER' = @("-DUPDATE_DEPS=ON", "-DBUILD_TESTS=OFF", "-DUSE_MASM=OFF", "-DUSE_GAS=OFF")
+        'VULKAN_LOADER' = @("-DVULKAN_HEADERS_INSTALL_DIR=$ExternalVulkanHeadersInstallDir", "-DBUILD_TESTS=OFF", "-DUSE_MASM=OFF", "-DUSE_GAS=OFF")
     }  
 
     $cMakeCacheVariableOverride = $cMakeOptions -join ' ' 

__externals/Vulkan-Headers

@@ -1,8 +1,9 @@
 # Packages
 #
 set(EXTERNAL_INCLUDE_DIRS
-	${IN_ENGINE_VULKAN_HEADER_PATH}
+	${EXTERNAL_DIR}/Vulkan-Headers/build/install/include
 	${EXTERNAL_DIR}/fmt/include
+	${EXTERNAL_DIR}/glm/glm
 	${EXTERNAL_DIR}/imgui/src
 	${EXTERNAL_DIR}/spdlog/include
 	${EXTERNAL_DIR}/glfw/include
@@ -31,6 +32,7 @@ add_library (imported::External_libs INTERFACE IMPORTED)
 target_link_libraries(imported::External_libs INTERFACE
 	vulkan
 	fmt
+	glm
 	imgui
 	spdlog
 	glfw

__externals/externals.cmake

@@ -22,6 +22,6 @@ target_include_directories (imgui
         ./src/backends
         ${EXTERNAL_DIR}/glfw/include
     PRIVATE
-        ${IN_ENGINE_VULKAN_HEADER_PATH}
+        ${EXTERNAL_DIR}/Vulkan-Headers/build/install/include
 )