2
0
Эх сурвалжийг харах

Win32: Fix Vulkan library paths for 1.0.42.0 SDK

Libraries have moved from Bin and Bin32 to Lib and Lib32.

Fixes #956.
Camilla Löwy 8 жил өмнө
parent
commit
c54b5da403

+ 4 - 0
CMake/modules/FindVulkan.cmake

@@ -10,16 +10,20 @@ if (WIN32)
         "$ENV{VK_SDK_PATH}/Include")
         "$ENV{VK_SDK_PATH}/Include")
     if (CMAKE_SIZEOF_VOID_P EQUAL 8)
     if (CMAKE_SIZEOF_VOID_P EQUAL 8)
         find_library(VULKAN_LIBRARY NAMES vulkan-1 HINTS
         find_library(VULKAN_LIBRARY NAMES vulkan-1 HINTS
+            "$ENV{VULKAN_SDK}/Lib"
             "$ENV{VULKAN_SDK}/Bin"
             "$ENV{VULKAN_SDK}/Bin"
             "$ENV{VK_SDK_PATH}/Bin")
             "$ENV{VK_SDK_PATH}/Bin")
         find_library(VULKAN_STATIC_LIBRARY NAMES vkstatic.1 HINTS
         find_library(VULKAN_STATIC_LIBRARY NAMES vkstatic.1 HINTS
+            "$ENV{VULKAN_SDK}/Lib"
             "$ENV{VULKAN_SDK}/Bin"
             "$ENV{VULKAN_SDK}/Bin"
             "$ENV{VK_SDK_PATH}/Bin")
             "$ENV{VK_SDK_PATH}/Bin")
     else()
     else()
         find_library(VULKAN_LIBRARY NAMES vulkan-1 HINTS
         find_library(VULKAN_LIBRARY NAMES vulkan-1 HINTS
+            "$ENV{VULKAN_SDK}/Lib32"
             "$ENV{VULKAN_SDK}/Bin32"
             "$ENV{VULKAN_SDK}/Bin32"
             "$ENV{VK_SDK_PATH}/Bin32")
             "$ENV{VK_SDK_PATH}/Bin32")
         find_library(VULKAN_STATIC_LIBRARY NAMES vkstatic.1 HINTS
         find_library(VULKAN_STATIC_LIBRARY NAMES vkstatic.1 HINTS
+            "$ENV{VULKAN_SDK}/Lib32"
             "$ENV{VULKAN_SDK}/Bin32"
             "$ENV{VULKAN_SDK}/Bin32"
             "$ENV{VK_SDK_PATH}/Bin32")
             "$ENV{VK_SDK_PATH}/Bin32")
     endif()
     endif()

+ 1 - 0
README.md

@@ -154,6 +154,7 @@ information on what to include when reporting a bug.
                   blanking or password enabled screensavers (#851)
                   blanking or password enabled screensavers (#851)
 - [Win32] Bugfix: Mouse capture logic lost secondary release messages (#954)
 - [Win32] Bugfix: Mouse capture logic lost secondary release messages (#954)
 - [Win32] Bugfix: The 32-bit Vulkan loader library static was not searched for
 - [Win32] Bugfix: The 32-bit Vulkan loader library static was not searched for
+- [Win32] Bugfix: Vulkan libraries have a new path as of SDK 1.0.42.0 (#956)
 - [X11] Replaced `_GLFW_HAS_XF86VM` compile-time option with dynamic loading
 - [X11] Replaced `_GLFW_HAS_XF86VM` compile-time option with dynamic loading
 - [X11] Bugfix: `glfwGetVideoMode` would segfault on Cygwin/X
 - [X11] Bugfix: `glfwGetVideoMode` would segfault on Cygwin/X
 - [X11] Bugfix: Dynamic X11 library loading did not use full sonames (#941)
 - [X11] Bugfix: Dynamic X11 library loading did not use full sonames (#941)