Renamed directory containing vulkan headers to avoid clash with system headers. Fixed issue #2097.

2020-04-07 20:42:31 -07:00 · 2020-04-07 20:42:31 -07:00 · aff6bc0d41
commit aff6bc0d41
parent 428040da52
20 changed files with 1 additions and 1 deletions
--- a/3rdparty/khronos/vulkan-local/vk_icd.h
+++ b/3rdparty/khronos/vulkan-local/vk_icd.h
--- a/3rdparty/khronos/vulkan-local/vk_layer.h
+++ b/3rdparty/khronos/vulkan-local/vk_layer.h
--- a/3rdparty/khronos/vulkan-local/vk_platform.h
+++ b/3rdparty/khronos/vulkan-local/vk_platform.h
--- a/3rdparty/khronos/vulkan-local/vk_sdk_platform.h
+++ b/3rdparty/khronos/vulkan-local/vk_sdk_platform.h
--- a/3rdparty/khronos/vulkan-local/vulkan.h
+++ b/3rdparty/khronos/vulkan-local/vulkan.h
--- a/3rdparty/khronos/vulkan-local/vulkan_android.h
+++ b/3rdparty/khronos/vulkan-local/vulkan_android.h
--- a/3rdparty/khronos/vulkan-local/vulkan_beta.h
+++ b/3rdparty/khronos/vulkan-local/vulkan_beta.h
--- a/3rdparty/khronos/vulkan-local/vulkan_core.h
+++ b/3rdparty/khronos/vulkan-local/vulkan_core.h
--- a/3rdparty/khronos/vulkan-local/vulkan_fuchsia.h
+++ b/3rdparty/khronos/vulkan-local/vulkan_fuchsia.h
--- a/3rdparty/khronos/vulkan-local/vulkan_ggp.h
+++ b/3rdparty/khronos/vulkan-local/vulkan_ggp.h
--- a/3rdparty/khronos/vulkan-local/vulkan_ios.h
+++ b/3rdparty/khronos/vulkan-local/vulkan_ios.h
--- a/3rdparty/khronos/vulkan-local/vulkan_macos.h
+++ b/3rdparty/khronos/vulkan-local/vulkan_macos.h
--- a/3rdparty/khronos/vulkan-local/vulkan_metal.h
+++ b/3rdparty/khronos/vulkan-local/vulkan_metal.h
--- a/3rdparty/khronos/vulkan-local/vulkan_vi.h
+++ b/3rdparty/khronos/vulkan-local/vulkan_vi.h
--- a/3rdparty/khronos/vulkan-local/vulkan_wayland.h
+++ b/3rdparty/khronos/vulkan-local/vulkan_wayland.h
--- a/3rdparty/khronos/vulkan-local/vulkan_win32.h
+++ b/3rdparty/khronos/vulkan-local/vulkan_win32.h
--- a/3rdparty/khronos/vulkan-local/vulkan_xcb.h
+++ b/3rdparty/khronos/vulkan-local/vulkan_xcb.h
--- a/3rdparty/khronos/vulkan-local/vulkan_xlib.h
+++ b/3rdparty/khronos/vulkan-local/vulkan_xlib.h
--- a/3rdparty/khronos/vulkan-local/vulkan_xlib_xrandr.h
+++ b/3rdparty/khronos/vulkan-local/vulkan_xlib_xrandr.h
--- a/src/renderer_vk.h
+++ b/src/renderer_vk.h
@ -32,7 +32,7 @@

 #define VK_NO_STDINT_H
 #define VK_NO_PROTOTYPES
-#include <vulkan/vulkan.h>
+#include <vulkan-local/vulkan.h>
 #include "renderer.h"
 #include "debug_renderdoc.h"