From b9ef1772da8af4e64b7e7196fe901f4c46aa46ac Mon Sep 17 00:00:00 2001 From: bjorn Date: Mon, 14 Nov 2022 20:54:43 -0800 Subject: [PATCH] =?UTF-8?q?L=C3=96VR=20no=20longer=20depends=20on=20system?= =?UTF-8?q?-installed=20Vulkan;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Experimental. --- .gitmodules | 3 +++ CMakeLists.txt | 3 +-- deps/vulkan-headers | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) create mode 160000 deps/vulkan-headers diff --git a/.gitmodules b/.gitmodules index 40b280c4..af35dac0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,3 +22,6 @@ [submodule "deps/glslang"] path = deps/glslang url = https://github.com/bjornbytes/glslang +[submodule "deps/vulkan-headers"] + path = deps/vulkan-headers + url = https://github.com/KhronosGroup/Vulkan-Headers diff --git a/CMakeLists.txt b/CMakeLists.txt index 6439feb9..315378dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -192,8 +192,7 @@ endif() # Vulkan if(LOVR_USE_VULKAN) - find_package(Vulkan REQUIRED) - include_directories(${Vulkan_INCLUDE_DIRS}) + include_directories(deps/vulkan-headers/include) endif() # OpenXR diff --git a/deps/vulkan-headers b/deps/vulkan-headers new file mode 160000 index 00000000..29c0457c --- /dev/null +++ b/deps/vulkan-headers @@ -0,0 +1 @@ +Subproject commit 29c0457cc167bfc9e9361a3818440e388986f5b5